Wip - fix issues with python 3.7.2

devdoomari3 · devdoomari3 · commit 49f0eaf48200 · 2018-12-27T17:57:41.000+09:00
diff --git a/py_codegen/type_extractor/ClassFound.py b/py_codegen/type_extractor/ClassFound.py
@@ -1,19 +1,16 @@
 from collections import OrderedDict
 from dataclasses import dataclass
+from typing import Optional
 
 
 @dataclass(
     order=True,
 )
 class ClassFound:
-    # def __eq__(self, other):
-    #     if not isinstance(other, ClassFound):
-    #         return False
-    #     if self.fields != other.fields:
-    #         return False
-    #     return True
     name: str
     filePath: str
     raw_fields: OrderedDict
     fields: OrderedDict
     doc: str
+    class_raw: Optional[type] = None
+
diff --git a/py_codegen/type_extractor/__tests__/test_func_with_nested_arg_class.py b/py_codegen/type_extractor/__tests__/test_func_with_nested_arg_class.py
@@ -28,27 +28,30 @@ def func_with_nested_arg_class(a: ParentClass) -> ParentClass:
 
     child_class = ClassFound(
         name='ChildClass',
-        fields=OrderedDict({
+        fields={
             'return': None,
             'carg1': str,
-        }),
+        },
         doc='',
         filePath='',
         raw_fields=OrderedDict(),
+        class_raw=ChildClass,
     )
     parent_class = ClassFound(
         name="ParentClass",
-        fields=OrderedDict({
+        fields={
             'return': None,
             'parg1': str,
             'parg2': child_class,
-        }),
+        },
         doc='',
         filePath='',
         raw_fields=OrderedDict(),
+        class_raw=ParentClass
     )
     parent_cleaned = traverse(parent_class, cleanup)
     child_cleaned = traverse(child_class, cleanup)
+    import pdb;pdb.set_trace()
     assert(parent_cleaned == cleanedup)
     assert (classes_list.__len__() == 2)
     assert (functions_list.__len__() == 1)
diff --git a/py_codegen/type_extractor/__tests__/test_utils.py b/py_codegen/type_extractor/__tests__/test_utils.py
@@ -1,9 +1,9 @@
 from py_codegen.type_extractor.ClassFound import ClassFound
 
 
-def test_utils_cleanup_nested_classfound():
-    parent_class = ClassFound(
-        name='somewhere',
-        filePath='parent',
-
-    )
+# def test_utils_cleanup_nested_classfound():
+#     parent_class = ClassFound(
+#         name='somewhere',
+#         filePath='parent',
+#
+#     )
diff --git a/py_codegen/type_extractor/__tests__/utils.py b/py_codegen/type_extractor/__tests__/utils.py
@@ -75,6 +75,11 @@ def cleanup(node: Union[ClassFound, FunctionFound]):
     if isinstance(node, ClassFound):
         new_node = deepcopy(node)
         new_node.raw_fields = OrderedDict()
+
+        # python 3.7.2 adds 'return': None to no-return classes.
+        new_node.fields.update({
+            'return': new_node.fields.get('return')
+        })
         new_node.filePath = ''
         new_node.doc = ''
         return new_node
diff --git a/py_codegen/type_extractor/type_extractor.py b/py_codegen/type_extractor/type_extractor.py
@@ -10,9 +10,11 @@
 from .FunctionFound import FunctionFound
 from .TypeOR import TypeOR
 
+
 def is_builtin(something):
     return inspect.getmodule(something) is builtins
 
+
 class TypeExtractor:
     functions: Dict[str, FunctionFound]
     classes: Dict[str, ClassFound]
@@ -87,6 +89,7 @@ def __to_class_found(self, _class):
         fields = self.__process_params(fields_to_process)
         class_found = ClassFound(
             name=_class.__name__,
+            class_raw=_class,
             filePath=filename,
             raw_fields=argspec.annotations,
             fields=fields,
