summaryrefslogtreecommitdiff
path: root/simplejson/encoder.py
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2017-11-05 10:28:38 -0800
committerBob Ippolito <bob@redivi.com>2017-11-05 10:28:38 -0800
commit0d36c5cd16055d55e6eceaf252f072a9339e0746 (patch)
treecc67ee76dab75a922c6970808ae61b29a90be077 /simplejson/encoder.py
parentdb2a216a858e8fd2cbfd53ac52c7972e5d3b3c5a (diff)
downloadsimplejson-0d36c5cd16055d55e6eceaf252f072a9339e0746.tar.gz
Fix #184 threaded import issue, prep v3.12.0v3.12.0
Diffstat (limited to 'simplejson/encoder.py')
-rw-r--r--simplejson/encoder.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/simplejson/encoder.py b/simplejson/encoder.py
index b5c3141..c87468a 100644
--- a/simplejson/encoder.py
+++ b/simplejson/encoder.py
@@ -14,7 +14,8 @@ def _import_speedups():
return None, None
c_encode_basestring_ascii, c_make_encoder = _import_speedups()
-from simplejson.decoder import PosInf
+from .decoder import PosInf
+from .raw_json import RawJSON
#ESCAPE = re.compile(ur'[\x00-\x1f\\"\b\f\n\r\t\u2028\u2029]')
# This is required because u() will mangle the string and ur'' isn't valid
@@ -39,14 +40,6 @@ for i in [0x2028, 0x2029]:
FLOAT_REPR = repr
-class RawJSON(object):
- """Wrap an encoded JSON document for direct embedding in the output
-
- """
- def __init__(self, encoded_json):
- self.encoded_json = encoded_json
-
-
def encode_basestring(s, _PY3=PY3, _q=u('"')):
"""Return a JSON representation of a Python string