From 2e4259f33328984db6d343b40683bf736b45deb4 Mon Sep 17 00:00:00 2001 From: Bernie Hackett Date: Tue, 22 Apr 2014 13:34:37 -0700 Subject: [PATCH] PYTHON-673 - Fix a json_util issue in python 3.x --- bson/json_util.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bson/json_util.py b/bson/json_util.py index 72f09177c..e998dfdc5 100644 --- a/bson/json_util.py +++ b/bson/json_util.py @@ -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)