Merge pull request #39 from mikekap/develop

Fix set constants.

tests/parser-cases/json/consts.json

@@ -5,7 +5,8 @@
     "num3": 30000000000,
     "str": "hello",
     "lst": [1, 2, 3],
-    "mp": {"key": "val"}
+    "mp": {"key": "val"},
+    "st": [1, 2, 3]
   },
   "includes": [],
   "namespaces": {},

tests/parser-cases/thrift/consts.thrift

@@ -3,4 +3,5 @@ const i32 num2 = 2000
 const i64 num3 = 30000000000
 const string str = "hello"
 const list<i32> lst = [1, 2, 3]
+const set<i32> st = [1, 2, 3]
 const map<string, string> mp = {"key": "val"}

tests/test_parser.py

@@ -14,9 +14,16 @@ def _json(name):
     return json.load(open(path))
 
 
+def _to_json(value):
+    if isinstance(value, (set, frozenset)):
+        return list(sorted(value))
+
+    assert False
+
+
 def _thrift(name):
     path = os.path.join('parser-cases', 'thrift', name + '.thrift')
-    return parse(open(path).read())
+    return json.loads(json.dumps(parse(open(path).read()), default=_to_json))
 
 
 class TestParser(object):

thriftpy/parser/model.py

@@ -143,7 +143,9 @@ def cast(self, data):
 
 
 class SetType(ContainerType):  # ['set', v_type]
-    pass
+
+    def cast(self, data):
+        return frozenset(map(self[1].cast, data))
 
 
 BASE_TYPE_MAPS = {