Merge pull request dropbox#73 from wittekm/bvStoneValidators

risforrob · web-flow · commit 44aa0db8c8d8 · 2018-02-24T22:33:27.000-08:00
Change python_type_stubs generator to use `bv` instead of `stone_validators` (oops!)
diff --git a/stone/backends/python_type_stubs.py b/stone/backends/python_type_stubs.py
@@ -161,7 +161,7 @@ def _generate_struct_class(self, ns, data_type):
     def _generate_validator_for(self, data_type):
         # type: (DataType) -> None
         cls_name = class_name_for_data_type(data_type)
-        self.emit("{}_validator = ...  # type: stone_validators.Validator".format(
+        self.emit("{}_validator: bv.Validator = ...".format(
             cls_name
         ))
 
@@ -377,7 +377,7 @@ def _generate_routes(
         for route in namespace.routes:
             var_name = fmt_func(route.name)
             self.emit(
-                "{var_name} = ...  # type: bb.Route".format(
+                "{var_name}: bb.Route = ...".format(
                     var_name=var_name
                 )
             )
diff --git a/test/test_python_type_stubs.py b/test/test_python_type_stubs.py
@@ -237,8 +237,8 @@ def f1(self, val: bool) -> None: ...
 
                 @f1.deleter
                 def f1(self) -> None: ...
-            
-            Struct1_validator = ...  # type: stone_validators.Validator
+
+            Struct1_validator: bv.Validator = ...
 
             class Struct2(object):
                 def __init__(self,
@@ -275,7 +275,7 @@ def f4(self, val: Dict[str, long]) -> None: ...
                 @f4.deleter
                 def f4(self) -> None: ...
 
-            Struct2_validator = ...  # type: stone_validators.Validator
+            Struct2_validator: bv.Validator = ...
 
 
             from typing import (
@@ -318,7 +318,7 @@ def nullable_list(self, val: Optional[List[long]]) -> None: ...
                 @nullable_list.deleter
                 def nullable_list(self) -> None: ...
 
-            NestedTypes_validator = ...  # type: stone_validators.Validator
+            NestedTypes_validator: bv.Validator = ...
 
 
             from typing import (
@@ -343,7 +343,7 @@ def is_first(self) -> bool: ...
 
                 def is_last(self) -> bool: ...
 
-            Union_validator = ...  # type: stone_validators.Validator
+            Union_validator: bv.Validator = ...
 
             class Shape(bb.Union):
                 point = ...  # type: Shape
@@ -357,8 +357,8 @@ def circle(cls, val: float) -> Shape: ...
 
                 def get_circle(self) -> float: ...
 
-            Shape_validator = ...  # type: stone_validators.Validator
-            
+            Shape_validator: bv.Validator = ...
+
             """).format(headers=_headers)
         self.assertEqual(result, expected)
 
@@ -371,8 +371,8 @@ def test__generate_base_namespace_module_with_empty_union__generates_pass(self):
 
             class EmptyUnion(bb.Union):
                 pass
-                
-            EmptyUnion_validator = ...  # type: stone_validators.Validator
+
+            EmptyUnion_validator: bv.Validator = ...
 
             """).format(headers=_headers)
         self.assertEqual(result, expected)
@@ -384,8 +384,8 @@ def test__generate_routes(self):
         expected = textwrap.dedent("""\
             {headers}
 
-            route_one = ...  # type: bb.Route
-            route_two = ...  # type: bb.Route
+            route_one: bb.Route = ...
+            route_two: bb.Route = ...
 
             """).format(headers=_headers)
         self.assertEqual(result, expected)
@@ -410,7 +410,7 @@ def f1(self, val: bool) -> None: ...
                 @f1.deleter
                 def f1(self) -> None: ...
 
-            Struct1_validator = ...  # type: stone_validators.Validator
+            Struct1_validator: bv.Validator = ...
 
             AliasToStruct1 = Struct1
             """).format(headers=_headers)
