stone 3.3.6__tar.gz → 3.3.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stone
-Version: 3.3.6
+Version: 3.3.7
 Summary: Stone is an interface description language (IDL) for APIs.
 Home-page: https://github.com/dropbox/stone
 Author: Ken Elkabany
@@ -21,6 +21,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: ply>=3.4
 Requires-Dist: six>=1.12.0
+Requires-Dist: packaging>=21.0
 
 .. image:: https://cfl.dropboxstatic.com/static/images/sdk/stone_banner.png
     :target: https://github.com/dropbox/stone

{stone-3.3.6 → stone-3.3.7}/ez_setup.py

@@ -23,7 +23,7 @@ import sys
 import tempfile
 import textwrap
 import zipfile
-from distutils import log
+from setuptools import log
 
 try:
     from site import USER_SITE

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

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

{stone-3.3.6 → stone-3.3.7}/stone/backends/obj_c_types.py

@@ -1006,7 +1006,7 @@ class ObjCTypesBackend(ObjCBaseBackend):
                         self.emit(
                             'jsonDict[@".tag"] = @"{}";'.format(fmt_var(tag)))
                 self.emit()
-            self.emit('return [jsonDict count] > 0 ? jsonDict : nil;')
+            self.emit('return jsonDict;')
         self.emit()
 
     def _generate_struct_deserializer(self, struct):
@@ -1152,7 +1152,7 @@ class ObjCTypesBackend(ObjCBaseBackend):
                     )
 
             self.emit()
-            self.emit('return [jsonDict count] > 0 ? jsonDict : nil;')
+            self.emit('return jsonDict;')
 
         self.emit()
 

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

@@ -826,6 +826,8 @@ class IRGenerator:
 
             # collect data types from subtypes recursively
             if is_struct_type(data_type) or is_union_type(data_type):
+                if data_type.parent_type:
+                    annotations.update(recurse(data_type.parent_type))
                 for field in data_type.fields:
                     annotations.update(recurse(field.data_type))
                     # annotations can be defined directly on fields

{stone-3.3.6 → stone-3.3.7}/stone/ir/api.py

@@ -1,6 +1,6 @@
 from collections import OrderedDict
 # See <https://github.com/PyCQA/pylint/issues/73>
-from distutils.version import StrictVersion  # pylint: disable=deprecated-module
+from packaging.version import Version
 
 from .data_types import (
     doc_unwrap,
@@ -34,7 +34,7 @@ class Api:
     """
     def __init__(self, version):
         # type: (str) -> None
-        self.version = StrictVersion(version)
+        self.version = Version(version)
         self.namespaces = OrderedDict()  # type: NamespaceDict
         self.route_schema = None  # type: typing.Optional[Struct]
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stone
-Version: 3.3.6
+Version: 3.3.7
 Summary: Stone is an interface description language (IDL) for APIs.
 Home-page: https://github.com/dropbox/stone
 Author: Ken Elkabany
@@ -21,6 +21,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: ply>=3.4
 Requires-Dist: six>=1.12.0
+Requires-Dist: packaging>=21.0
 
 .. image:: https://cfl.dropboxstatic.com/static/images/sdk/stone_banner.png
     :target: https://github.com/dropbox/stone

{stone-3.3.6 → stone-3.3.7}/stone.egg-info/requires.txt

@@ -1,2 +1,3 @@
 ply>=3.4
 six>=1.12.0
+packaging>=21.0

{stone-3.3.6 → stone-3.3.7}/test/test_backend.py

@@ -282,7 +282,7 @@ int sq(int x) <
         self.assertIsInstance(string_type, String)
 
     def test_preserve_aliases_from_api(self):
-        api = Api(version=None)
+        api = Api(version="0.1b1")
         # Ensure imports come after 'preserve_alias' lexiographicaly
         # to catch namespace ordering bugs
         api.ensure_namespace('preserve_alias')
@@ -390,7 +390,7 @@ int sq(int x) <
         self.assertIsInstance(field.data_type, Alias)
 
     def test_no_preserve_aliases_from_api(self):
-        api = Api(version=None)
+        api = Api(version="0.1b1")
         # Ensure imports come after 'preserve_alias' lexiographicaly
         # to catch namespace ordering bugs
         api.ensure_namespace('preserve_alias')