add typing.Tuple

devdoomari3 · devdoomari3 · commit b8cb312481b7 · 2019-04-29T10:58:31.000+09:00
diff --git a/py_codegen/test_fixtures/func_with_tuple.py b/py_codegen/test_fixtures/func_with_tuple.py
@@ -0,0 +1,5 @@
+from typing import Tuple
+
+
+def func_with_tuple(input: Tuple[str, int]) -> Tuple[int, str]:
+    return (Tuple[1], Tuple[0])
diff --git a/py_codegen/type_extractor/__tests__/test_func_with_tuple.py b/py_codegen/type_extractor/__tests__/test_func_with_tuple.py
@@ -0,0 +1,26 @@
+from py_codegen.type_extractor.__tests__.utils import cleanup, traverse
+from py_codegen.type_extractor.nodes.FunctionFound import FunctionFound
+from py_codegen.type_extractor.nodes.TupleFound import TupleFound
+from py_codegen.type_extractor.type_extractor import TypeExtractor
+from py_codegen.test_fixtures.func_with_tuple import func_with_tuple
+
+
+def test_func_with_tuple():
+    type_collector = TypeExtractor()
+
+    type_collector.add_function(None)(func_with_tuple)
+
+    # assert type_collector.classes == {}
+    func_found_cleaned = cleanup(
+        type_collector.functions[func_with_tuple.__qualname__],
+    )
+    assert func_found_cleaned == traverse(
+        FunctionFound(
+            name=func_with_tuple.__qualname__,
+            params={
+              'input': TupleFound([str, int]),
+            },
+            return_type=TupleFound([int, str]),
+        ),
+        cleanup,
+    )
diff --git a/py_codegen/type_extractor/nodes/TupleFound.py b/py_codegen/type_extractor/nodes/TupleFound.py
@@ -0,0 +1,7 @@
+from typing import NamedTuple, List
+
+from py_codegen.type_extractor.nodes.BaseNodeType import BaseNodeType, NodeType
+
+
+class TupleFound(NamedTuple, BaseNodeType):  # type: ignore
+    types: List[NodeType]
diff --git a/py_codegen/type_extractor/type_extractor.py b/py_codegen/type_extractor/type_extractor.py
@@ -3,14 +3,21 @@
 from collections import OrderedDict
 from copy import deepcopy
 from dataclasses import dataclass
-from typing import Callable, Dict, Union, List
+from typing import (
+    Callable,
+    Dict,
+    Union,
+    List,
+    Tuple,
+)
 
 from mypy_extensions import _TypedDictMeta  # type: ignore
 
 from py_codegen.type_extractor.nodes.BaseNodeType import NodeType
 from py_codegen.type_extractor.nodes.DictFound import DictFound
 from py_codegen.type_extractor.nodes.ListFound import ListFound
 from py_codegen.type_extractor.nodes.NoneNode import NoneNode
+from py_codegen.type_extractor.nodes.TupleFound import TupleFound
 from py_codegen.type_extractor.nodes.TypedDictFound import TypedDictFound
 from py_codegen.type_extractor.nodes.ClassFound import ClassFound
 from py_codegen.type_extractor.nodes.UnknownFound import unknown_found
@@ -76,6 +83,8 @@ def __process_param(self, typ):
                 return self.__process_union(typ)
             if typ_origin is dict or typ_origin is Dict:
                 return self.__process_dict(typ)
+            if typ_origin is tuple or typ_origin is Tuple:
+                return self.__process_tuple(typ)
 
         except:
             pass
@@ -128,6 +137,11 @@ def __process_list(self, list_typ):
         processed_typ = self.__process_param(list_typ.__args__[0])
         return ListFound(typ=processed_typ)
 
+    def __process_tuple(self, tuple_typ):
+        assert(tuple_typ.__origin__ == tuple)
+        processed_typ = [self.__process_param(param) for param in tuple_typ.__args__]
+        return TupleFound(types=processed_typ)
+
     def __process_union(self, union):
         assert(union.__origin__ is Union)
         types = union.__args__
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-setuptools==39.0.1
+setuptools==41.0.1
 dataclasses==0.6
 extractor==0.5
 typing==3.6.6
