mongodb/mongo-python-driver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PYTHON-673 - Fix a json_util issue in python 3.x

Browse Source
This commit is contained in:
Bernie Hackett 2014-04-22 13:34:37 -07:00
parent 0e9f6692f1
commit 2e4259f333
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bson/json_util.py
View File

@ -77,8 +77,6 @@ import calendar
import datetime
import re
from bson.py3compat import iteritems, text_type
json_lib = True
try:
import json
@ -99,7 +97,7 @@ from bson.objectid import ObjectId
from bson.regex import Regex
from bson.timestamp import Timestamp
from bson.py3compat import PY3, binary_type, string_type
from bson.py3compat import PY3, binary_type, iteritems, string_types, text_type
_RE_OPT_TABLE = {
@ -154,7 +152,7 @@ def _json_convert(obj):
"""
if hasattr(obj, 'iteritems') or hasattr(obj, 'items'): # PY3 support
return SON(((k, _json_convert(v)) for k, v in iteritems(obj)))
elif hasattr(obj, '__iter__') and not isinstance(obj, string_type):
elif hasattr(obj, '__iter__') and not isinstance(obj, string_types):
return list((_json_convert(v) for v in obj))
try:
return default(obj)