merge with 1.0

This commit is contained in:
Georg Brandl
2010-07-28 10:00:42 +02:00

View File

@@ -39,5 +39,8 @@ def dumps(obj, *args, **kwds):
kwds['cls'] = SphinxJSONEncoder
return json.dumps(obj, *args, **kwds)
load = json.load
loads = json.loads
def load(*args, **kwds):
return json.load(*args, **kwds)
def loads(*args, **kwds):
return json.loads(*args, **kwds)