stone 3.3.3__tar.gz → 3.3.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stone
-Version: 3.3.3
+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.3 → 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.3 → 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.3',
+    version='3.3.7',
     install_requires=install_reqs,
     setup_requires=setup_requires,
     tests_require=test_reqs,

{stone-3.3.3 → 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.3 → stone-3.3.7}/stone/backends/python_rsrc/stone_validators.py

@@ -91,6 +91,17 @@ def generic_type_name(v):
         return type_name_with_module(type(v))
 
 
+def get_value_string(v, max_length=1000):
+    # type: (typing.Any, int) -> str
+    """Return a truncated version of the input string.  If the input string is longer than
+       1000 characters, this will return the first 1000 characters and append with '[The
+       string has been truncated due to its length]' to indicate that it has been truncated."""
+    v_str = str(v)
+    if len(v_str) > max_length:
+        return v_str[:max_length] + ' [The string has been truncated due to its length]'
+    return v_str
+
+
 class Validator(metaclass=ABCMeta):
     """All primitive and composite data types should be a subclass of this."""
     __slots__ = ("_redact",)
@@ -322,7 +333,7 @@ class String(Primitive):
         """
         if not isinstance(val, str):
             raise ValidationError("'%s' expected to be a string, got %s"
-                                  % (val, generic_type_name(val)))
+                                  % (get_value_string(val), generic_type_name(val)))
         if not six.PY3 and isinstance(val, str):
             try:
                 val = val.decode('utf-8')
@@ -331,14 +342,18 @@ class String(Primitive):
 
         if self.max_length is not None and len(val) > self.max_length:
             raise ValidationError("'%s' must be at most %d characters, got %d"
-                                  % (val, self.max_length, len(val)))
+                                  % (get_value_string(val), self.max_length, len(val)))
         if self.min_length is not None and len(val) < self.min_length:
             raise ValidationError("'%s' must be at least %d characters, got %d"
-                                  % (val, self.min_length, len(val)))
+                                  % (get_value_string(val), self.min_length, len(val)))
 
         if self.pattern and not self.pattern_re.match(val):
+            # Detect if pattern is matching an email address and return redacted error message.
+            if self.pattern == "^['#&A-Za-z0-9._%+-]+@[A-Za-z0-9-][A-Za-z0-9.-]*\\.[A-Za-z]{2,15}$":
+                val = "*****"
+
             raise ValidationError("'%s' did not match pattern '%s'"
-                                  % (val, self.pattern))
+                                  % (get_value_string(val), self.pattern))
         return val
 
 
@@ -366,10 +381,10 @@ class Bytes(Primitive):
                                   % generic_type_name(val))
         elif self.max_length is not None and len(val) > self.max_length:
             raise ValidationError("'%s' must have at most %d bytes, got %d"
-                                  % (val, self.max_length, len(val)))
+                                  % (get_value_string(val), self.max_length, len(val)))
         elif self.min_length is not None and len(val) < self.min_length:
             raise ValidationError("'%s' has fewer than %d bytes, got %d"
-                                  % (val, self.min_length, len(val)))
+                                  % (get_value_string(val), self.min_length, len(val)))
         return val
 
 
@@ -425,13 +440,13 @@ class List(Composite):
 
     def validate(self, val):
         if not isinstance(val, (tuple, list)):
-            raise ValidationError('%r is not a valid list' % val)
+            raise ValidationError('%r is not a valid list' % get_value_string(val))
         elif self.max_items is not None and len(val) > self.max_items:
             raise ValidationError('%r has more than %s items'
-                                  % (val, self.max_items))
+                                  % (get_value_string(val), self.max_items))
         elif self.min_items is not None and len(val) < self.min_items:
             raise ValidationError('%r has fewer than %s items'
-                                  % (val, self.min_items))
+                                  % (get_value_string(val), self.min_items))
         return [self.item_validator.validate(item) for item in val]
 
 
@@ -449,7 +464,7 @@ class Map(Composite):
 
     def validate(self, val):
         if not isinstance(val, dict):
-            raise ValidationError('%r is not a valid dict' % val)
+            raise ValidationError('%r is not a valid dict' % get_value_string(val))
         return {
             self.key_validator.validate(key):
                 self.value_validator.validate(value) for key, value in val.items()

{stone-3.3.3 → 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.3 → 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.3 → stone-3.3.7/stone.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stone
-Version: 3.3.3
+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.3 → 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.3 → 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')