Actually tests to see if a ClassObject has constructors and, if so, g… · pythonnet/pythonnet@ba61f42 · GitHub

pythonnet / pythonnet Public

• Notifications You must be signed in to change notification settings
• Fork 780
• Star 5.5k

• Code
• Issues 153
• Pull requests 12
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit ba61f42

Browse filesBrowse the repository at this point in the historyBrowse files

Barton Cline

committed

Actually tests to see if a ClassObject has constructors and, if so, generates a __doc__ string.

Formerly, the __doc__ string was set to an empty string. Now it remains None and test_enum.py checks for that. This is also a step toward SomeObject.Overloads[]() handling which, of course, should not be attempted if the ClassObject doesn't have constructors. The current readme.html details the direction I'm heading with that one.

1 parent a9b0074 commit ba61f42
Copy full SHA for ba61f42

3 files changed

+10-6Lines changed: 10 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• pythonnet/src
  • runtime
    • classmanager.cs
    • classobject.cs
  • tests
    • test_enum.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎pythonnet/src/runtime/classmanager.cs‎

Copy file name to clipboardExpand all lines: pythonnet/src/runtime/classmanager.cs

+7-3Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -129,10 +129,14 @@ private static ClassBase CreateClass(Type type) {
129	129	// If class has constructors, generate an __doc__ attribute.
130	130
131	131	ClassObject co = impl as ClassObject;
	132	+ // If this is a ClassObject AND it has constructors, generate a __doc__ attribute.
	133	+ // required that the ClassObject.ctors be changed to internal
132	134	if (co != null) {
133		- IntPtr doc = co.GetDocString();
134		- Runtime.PyDict_SetItemString(dict, "__doc__", doc);
135		- Runtime.Decref(doc);
	135	+ if (co.ctors.Length > 0) {
	136	+ IntPtr doc = co.GetDocString();
	137	+ Runtime.PyDict_SetItemString(dict, "__doc__", doc);
	138	+ Runtime.Decref(doc);
	139	+ }
136	140	}
137	141
138	142	return impl;

Collapse file

‎pythonnet/src/runtime/classobject.cs‎

Copy file name to clipboardExpand all lines: pythonnet/src/runtime/classobject.cs

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -21,8 +21,8 @@ namespace Python.Runtime {
21	21
22	22	internal class ClassObject : ClassBase {
23	23
24		- ConstructorBinder binder;
25		- ConstructorInfo[] ctors;
	24	+ internal ConstructorBinder binder;
	25	+ internal ConstructorInfo[] ctors;
26	26
27	27	internal ClassObject(Type tp) : base(tp) {
28	28	ctors = type.GetConstructors();

Collapse file

‎pythonnet/src/tests/test_enum.py‎

Copy file name to clipboardExpand all lines: pythonnet/src/tests/test_enum.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -20,7 +20,7 @@ def testEnumStandardAttrs(self):
20	20	self.failUnless(DayOfWeek.__name__ == 'DayOfWeek')
21	21	self.failUnless(DayOfWeek.__module__ == 'System')
22	22	self.failUnless(type(DayOfWeek.__dict__) == types.DictProxyType)
23		- self.failUnless(DayOfWeek.__doc__ == '')
	23	+ self.failUnless(DayOfWeek.__doc__ == None)
24	24
25	25
26	26	def testEnumGetMember(self):

0 commit comments

Comments

0 (0)