Merge pull request #125 from Thriftpy/issue-121

Support include files with dot in name

Author: ethe

tests/parser-cases/issue_121.include.thrift

@@ -0,0 +1,3 @@
+struct A {
+    1: string value
+}

tests/parser-cases/issue_121.thrift

@@ -0,0 +1,5 @@
+include "./issue_121.include.thrift"
+
+struct B {
+    1: issue_121.include.A a
+}

tests/test_http.py

@@ -13,7 +13,7 @@
 thriftpy2.install_import_hook()  # noqa
 
 from thriftpy2.http import make_server, make_client, client_context  # noqa
-from thriftpy2.thrift import TApplicationException
+from thriftpy2.thrift import TApplicationException  # noqa
 
 
 addressbook = thriftpy2.load(os.path.join(os.path.dirname(__file__),

tests/test_parser.py

@@ -298,3 +298,7 @@ def test_nest_incomplete_type():
         2: (15, 'field2', (15, (12, thrift.A)), False),
         3: (15, 'field3', (15, (15, (12, thrift.A))), False)
     }
+
+
+def test_issue_121():
+    load('parser-cases/issue_121.thrift')

thriftpy2/parser/parser.py

@@ -391,14 +391,26 @@ def p_ref_type(p):
     '''ref_type : IDENTIFIER'''
     ref_type = thrift_stack[-1]
 
-    for index, name in enumerate(p[1].split('.')):
-        ref_type = getattr(ref_type, name, None)
-        if ref_type is None:
-            if index != len(p[1].split('.')) - 1:
-                raise ThriftParserError('No type found: %r, at line %d' %
-                                        (p[1], p.lineno(1)))
-            p[0] = incomplete_type.set_info((p[1], p.lineno(1)))
-            return
+    for attr in dir(ref_type):
+        if attr in {'__doc__', '__loader__', '__name__', '__package__',
+                    '__spec__', '__thrift_file__', '__thrift_meta__'}:
+            continue
+        if p[1].startswith(attr + '.'):
+            name = p[1][len(attr)+1:]
+            included_ref_type = getattr(ref_type, attr)
+            resolved_ref_type = getattr(included_ref_type, name, None)
+            if resolved_ref_type is not None:
+                ref_type = resolved_ref_type
+                break
+    else:
+        for index, name in enumerate(p[1].split('.')):
+            ref_type = getattr(ref_type, name, None)
+            if ref_type is None:
+                if index != len(p[1].split('.')) - 1:
+                    raise ThriftParserError('No type found: %r, at line %d' %
+                                            (p[1], p.lineno(1)))
+                p[0] = incomplete_type.set_info((p[1], p.lineno(1)))
+                return
 
     if hasattr(ref_type, '_ttype'):
         p[0] = getattr(ref_type, '_ttype'), ref_type