transit-python 0.8.228-__py2.7.egg → 0.8.240__py2.7.egg

EGG-INFO/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: transit-python
-Version: 0.8.228-
+Version: 0.8.240-
 Summary: Transit marshalling for Python
 Home-page: https://github.com/cognitect/transit-python
 Author: Cognitect

EGG-INFO/SOURCES.txt

@@ -1,7 +1,10 @@
 setup.cfg
 setup.py
 scratch/__init__.py
+scratch/bools.py
 scratch/cache-inconsistent.py
+scratch/dt.py
+scratch/emptyset.py
 scratch/frozendict.py
 scratch/int_issue.py
 scratch/issue.py

scratch/bools.py

@@ -0,0 +1,15 @@
+from transit.transit_types import true, false
+                                    
+
+if true:
+    print("ok")
+if not true:
+    print("not ok")
+if false:
+    print("not ok")
+if not false:
+    print("ok")
+if true and false:
+    print("not ok")
+if true or false:
+    print("ok")

scratch/dt.py

@@ -0,0 +1,7 @@
+from transit.writer import Writer
+from StringIO import StringIO
+import datetime as dt
+
+io = StringIO()
+writer = Writer(io, "json")
+writer.write({"date": dt.datetime.utcnow()})

scratch/emptyset.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from transit.writer import Writer
+from transit.reader import Reader
+from transit.transit_types import URI
+from StringIO import StringIO
+import sys
+
+io = StringIO()
+
+x = set()
+print(x)
+
+writer = Writer(io, protocol="json")
+writer.write(x)
+reader = Reader(protocol="json")
+print io.getvalue()
+io.seek(0)
+outcome = reader.read(io)
+print(outcome)

scratch/msgpack_issue.py

@@ -2,11 +2,18 @@ from transit.reader import Reader
 from transit.writer import Writer
 from StringIO import StringIO
 
-mpcode = "94a37e6360a37e637ea37e635ea37e6323".decode("hex")
+#json = "{\"~#set\":[{\"~#set\":[1,3,2]},{\"~#set\":[null,0,2.0,\"~~eight\",1,true,\"five\",false,\"~$seven\",\"~:six\"]}]}\n"
+#mpcode = "94a37e6360a37e637ea37e635ea37e6323".decode("hex")
 
+json = "{\"~#set\":[1,true]}"
 io = StringIO()
-io.write(mpcode)
+io.write(json)
 io.seek(0)
-r = Reader(protocol="msgpack")
-print(r.read(io))
+r = Reader(protocol="json")
+correct = r.read(io)
+out = StringIO()
+w = Writer(out, protocol="json")
+w.write(correct)
+print(json)
+print(out.getvalue())
 

tests/exemplars_test.py

@@ -17,7 +17,7 @@ import unittest
 # then import transit stuff
 from transit.reader import Reader, JsonUnmarshaler, MsgPackUnmarshaler
 from transit.writer import Writer
-from transit.transit_types import Keyword, Symbol, URI, frozendict, TaggedValue, Link
+from transit.transit_types import Keyword, Symbol, URI, frozendict, TaggedValue, Link, true, false
 from StringIO import StringIO
 from transit.helpers import mapcat
 from helpers import ints_centered_on, hash_of_size, array_of_symbools
@@ -96,7 +96,7 @@ def exemplar(name, val):
     globals()["test_" + name + "_json"] = ExemplarTest
 
 ARRAY_SIMPLE = (1, 2, 3)
-ARRAY_MIXED = (0, 1, 2.0, True, False, 'five', Keyword("six"), Symbol("seven"), '~eight', None)
+ARRAY_MIXED = (0, 1, 2.0, true, false, 'five', Keyword("six"), Symbol("seven"), '~eight', None)
 ARRAY_NESTED = (ARRAY_SIMPLE, ARRAY_MIXED)
 SMALL_STRINGS = ("", "a", "ab", "abc", "abcd", "abcde", "abcdef")
 POWERS_OF_TWO = tuple(map(lambda x: pow(2, x), range(66)))
@@ -131,14 +131,14 @@ MAP_SIMPLE = frozendict({Keyword("a"): 1,
 
 MAP_MIXED = frozendict({Keyword("a"): 1,
                         Keyword("b"): u"a string",
-                        Keyword("c"): True})
+                        Keyword("c"): true})
 
 MAP_NESTED = frozendict({Keyword("simple"): MAP_SIMPLE,
                          Keyword("mixed"): MAP_MIXED})
 
 exemplar("nil", None)
-exemplar("true", True)
-exemplar("false", False)
+exemplar("true", true)
+exemplar("false", false)
 exemplar("zero", 0)
 exemplar("one", 1)
 exemplar("one_string", "hello")

tests/regression.py

@@ -17,7 +17,7 @@ import unittest
 
 from transit.reader import Reader
 from transit.writer import Writer
-from transit.transit_types import Symbol, frozendict
+from transit.transit_types import Symbol, frozendict, true, false
 from StringIO import StringIO
 
 class RegressionBaseTest(unittest.TestCase):
@@ -37,12 +37,44 @@ def regression(name, value):
 
     globals()["test_" + name + "_json"] = RegressionTest
 
-regression("cache_consistency", ({"Problem?":True},
+regression("cache_consistency", ({"Problem?":true},
                                   Symbol("Here"),
                                   Symbol("Here")))
 regression("one_pair_frozendict", frozendict({"a":1}))
 regression("json_int_max", (2**53+100, 2**63+100))
 regression("newline_in_string", "a\nb")
 
+class BooleanTest(unittest.TestCase):
+    """Even though we're roundtripping transit_types.true and
+    transit_types.false now, make sure we can still write Python bools.
+
+    Additionally, make sure we can still do basic logical evaluation on transit
+    Boolean values.
+    """
+    def test_write_bool(self):
+        for protocol in ("json", "json-verbose", "msgpack"):
+            io = StringIO()
+            w = Writer(io, protocol)
+            w.write((True, False))
+            r = Reader(protocol)
+            io.seek(0)
+            out_data = r.read(io)
+            assert out_data[0] == true
+            assert out_data[1] == false
+
+    def test_basic_eval(self):
+        assert true
+        assert not false
+
+    def test_or(self):
+        assert true or false
+        assert not (false or false)
+        assert true or true
+
+    def test_and(self):
+        assert not (true and false)
+        assert true and true
+        assert not (false and false)
+
 if __name__ == '__main__':
     unittest.main()

transit/decoder.py

@@ -18,6 +18,7 @@ from collections import OrderedDict
 from helpers import pairs
 import read_handlers as rh
 from rolling_cache import RollingCache, is_cacheable, is_cache_key
+from transit_types import true, false
 
 class Tag(object):
     def __init__(self, tag):
@@ -88,8 +89,9 @@ class Decoder(object):
             return self.decode_list(node, cache, as_map_key)
         elif tp is str:
             return self.decode_string(unicode(node, "utf-8"), cache, as_map_key)
-        else:
-            return node
+        elif tp is bool:
+            return true if node else false
+        return node
 
     def decode_list(self, node, cache, as_map_key):
         """Special case decodes map-as-array.

transit/read_handlers.py

@@ -47,7 +47,7 @@ class SymbolHandler(object):
 class BooleanHandler(object):
     @staticmethod
     def from_rep(x):
-        return x == "t"
+        return transit_types.true if x == "t" else transit_types.false
 
 class IntHandler(object):
     @staticmethod

transit/transit_types.py

@@ -188,3 +188,29 @@ class Link(object):
     @property
     def as_array(self):
         return [self.href, self.rel, self.name, self.render, self.prompt]
+
+class Boolean(object):
+    """To allow a separate t/f that won't hash as 1/0. Don't call directly,
+    instead use true and false as singleton objects. Can use with type check.
+
+    Note that the Booleans are for preserving hash/set bools that duplicate 1/0
+    and not designed for use in Python outside of logical evaluation (don't treat
+    as an int, they're not). You can get a Python bool using bool(x)
+    where x is a true or false Boolean.
+    """
+    def __init__(self, name):
+        self.v = True if name == "true" else False
+        self.name = name
+
+    def __nonzero__(self):
+        return self.v
+
+    def __repr__(self):
+        return self.name
+
+    def __str__(self):
+        return self.name
+
+# lowercase rep matches java/clojure
+false = Boolean("false")
+true = Boolean("true")

transit/write_handlers.py

@@ -14,7 +14,7 @@
 
 from constants import *
 from class_hash import ClassDict
-from transit_types import Keyword, Symbol, URI, frozendict, TaggedValue, Link
+from transit_types import Keyword, Symbol, URI, frozendict, TaggedValue, Link, Boolean
 import uuid
 import datetime, time
 from dateutil import tz
@@ -103,7 +103,7 @@ class BooleanHandler(object):
         return '?'
     @staticmethod
     def rep(b):
-        return b
+        return bool(b)
     @staticmethod
     def string_rep(b):
         return 't' if b else 'f'
@@ -258,6 +258,7 @@ class WriteHandler(ClassDict):
         super(WriteHandler, self).__init__()
         self[type(None)] = NoneHandler
         self[bool] = BooleanHandler
+        self[Boolean] = BooleanHandler
         self[str] = StringHandler
         self[unicode] = StringHandler
         self[list] = ArrayHandler

transit/writer.py

@@ -101,7 +101,7 @@ class Marshaler(object):
         return self.emit_string(ESC, "_", None, True, cache) if as_map_key else self.emit_object(None)
 
     def emit_string(self, prefix, tag, string, as_map_key, cache):
-        encoded = cache.encode(str(prefix)+tag+escape(string), as_map_key)
+        encoded = cache.encode(str(prefix)+tag+string, as_map_key)
         # TODO: Remove this optimization for the time being - it breaks the cache
         #if "cache_enabled" in self.opts and is_cacheable(encoded, as_map_key):
         #    return self.emit_object(cache.value_to_key[encoded], as_map_key)
@@ -222,7 +222,7 @@ class Marshaler(object):
 
 marshal_dispatch = {"_": Marshaler.emit_nil,
                     "?": Marshaler.emit_boolean,
-                    "s": lambda self, rep, as_map_key, cache: Marshaler.emit_string(self, "", "", rep, as_map_key, cache),
+                    "s": lambda self, rep, as_map_key, cache: Marshaler.emit_string(self, "", "", escape(rep), as_map_key, cache),
                     "i": lambda self, rep, as_map_key, cache: Marshaler.emit_int(self, "i", rep, as_map_key, cache),
                     "n": lambda self, rep, as_map_key, cache: Marshaler.emit_int(self, "n", rep, as_map_key, cache),
                     "d": Marshaler.emit_double,
@@ -383,7 +383,7 @@ class VerboseSettings(object):
         self.handlers = self._verbose_handlers(WriteHandler())
 
     def emit_string(self, prefix, tag, string, as_map_key, cache):
-        return self.emit_object(unicode(prefix) + tag + escape(string), as_map_key)
+        return self.emit_object(unicode(prefix) + tag + string, as_map_key)
 
     def emit_map(self, m, _, cache):
         self.emit_map_start(len(m))