From 7d5c3dcd969161322deed6c43f8a6a3cb92c3369 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 11 Nov 2014 11:53:55 -0500
Subject: upgrade to 14.4.1

---
 zmq/utils/jsonapi.py | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 zmq/utils/jsonapi.py

(limited to 'zmq/utils/jsonapi.py')

diff --git a/zmq/utils/jsonapi.py b/zmq/utils/jsonapi.py
new file mode 100644
index 0000000..865ca6d
--- /dev/null
+++ b/zmq/utils/jsonapi.py
@@ -0,0 +1,59 @@
+"""Priority based json library imports.
+
+Always serializes to bytes instead of unicode for zeromq compatibility
+on Python 2 and 3.
+
+Use ``jsonapi.loads()`` and ``jsonapi.dumps()`` for guaranteed symmetry.
+
+Priority: ``simplejson`` > ``jsonlib2`` > stdlib ``json``
+
+``jsonapi.loads/dumps`` provide kwarg-compatibility with stdlib json.
+
+``jsonapi.jsonmod`` will be the module of the actual underlying implementation.
+"""
+
+# Copyright (C) PyZMQ Developers
+# Distributed under the terms of the Modified BSD License.
+
+from zmq.utils.strtypes import bytes, unicode
+
+jsonmod = None
+
+priority = ['simplejson', 'jsonlib2', 'json']
+for mod in priority:
+    try:
+        jsonmod = __import__(mod)
+    except ImportError:
+        pass
+    else:
+        break
+
+def dumps(o, **kwargs):
+    """Serialize object to JSON bytes (utf-8).
+    
+    See jsonapi.jsonmod.dumps for details on kwargs.
+    """
+    
+    if 'separators' not in kwargs:
+        kwargs['separators'] = (',', ':')
+    
+    s = jsonmod.dumps(o, **kwargs)
+    
+    if isinstance(s, unicode):
+        s = s.encode('utf8')
+    
+    return s
+
+def loads(s, **kwargs):
+    """Load object from JSON bytes (utf-8).
+    
+    See jsonapi.jsonmod.loads for details on kwargs.
+    """
+    
+    if str is unicode and isinstance(s, bytes):
+        s = s.decode('utf8')
+    
+    return jsonmod.loads(s, **kwargs)
+
+__all__ = ['jsonmod', 'dumps', 'loads']
+
-- 
cgit v1.2.3