stone 3.3.7__tar.gz → 3.3.8__tar.gz

{stone-3.3.7/stone.egg-info → stone-3.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stone
-Version: 3.3.7
+Version: 3.3.8
 Summary: Stone is an interface description language (IDL) for APIs.
 Home-page: https://github.com/dropbox/stone
 Author: Ken Elkabany

{stone-3.3.7 → stone-3.3.8}/setup.py

@@ -36,7 +36,7 @@ with open('README.rst') as f:  # pylint: disable=W1514
 
 dist = setup(
     name='stone',
-    version='3.3.7',
+    version='3.3.8',
     install_requires=install_reqs,
     setup_requires=setup_requires,
     tests_require=test_reqs,

{stone-3.3.7 → stone-3.3.8}/stone/backends/python_types.py

@@ -640,15 +640,23 @@ class PythonTypesBackend(CodeBackend):
         dt, _, _ = unwrap(data_type)
         if is_struct_type(dt) or is_union_type(dt):
             annotation_types_seen = set()
-            for _, annotation in dt.recursive_custom_annotations:
-                if annotation.annotation_type not in annotation_types_seen:
-                    yield (annotation.annotation_type,
-                           generate_func_call(
-                               'bb.make_struct_annotation_processor',
-                               args=[class_name_for_annotation_type(annotation.annotation_type, ns),
-                                     'processor']
-                           ))
-                    annotation_types_seen.add(annotation.annotation_type)
+            # If data type enumerates subtypes, recurse to subtypes instead which in turn collect parents' custom annotations
+            if is_struct_type(dt) and dt.has_enumerated_subtypes():
+                for subtype in dt.get_enumerated_subtypes():
+                    for annotation_type, recursive_processor in self._generate_custom_annotation_processors(ns, subtype.data_type):
+                        if annotation_type not in annotation_types_seen:
+                            yield (annotation_type, recursive_processor)
+                            annotation_types_seen.add(annotation_type)
+            else:
+                for _, annotation in dt.recursive_custom_annotations:
+                    if annotation.annotation_type not in annotation_types_seen:
+                        yield (annotation.annotation_type,
+                               generate_func_call(
+                                   'bb.make_struct_annotation_processor',
+                                   args=[class_name_for_annotation_type(annotation.annotation_type, ns),
+                                         'processor']
+                               ))
+                        annotation_types_seen.add(annotation.annotation_type)
         elif is_list_type(dt):
             for annotation_type, recursive_processor in self._generate_custom_annotation_processors(
                     ns, dt.data_type):

{stone-3.3.7 → stone-3.3.8}/stone/frontend/ir_generator.py

@@ -824,10 +824,11 @@ class IRGenerator:
 
             annotations = set()
 
-            # collect data types from subtypes recursively
             if is_struct_type(data_type) or is_union_type(data_type):
+                # collect custom annotations from ancestor data types
                 if data_type.parent_type:
                     annotations.update(recurse(data_type.parent_type))
+                # collct custom annotations from nested data types
                 for field in data_type.fields:
                     annotations.update(recurse(field.data_type))
                     # annotations can be defined directly on fields

{stone-3.3.7 → stone-3.3.8/stone.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stone
-Version: 3.3.7
+Version: 3.3.8
 Summary: Stone is an interface description language (IDL) for APIs.
 Home-page: https://github.com/dropbox/stone
 Author: Ken Elkabany