summaryrefslogtreecommitdiff
path: root/sphinx/util/jsdump.py
diff options
context:
space:
mode:
authorTakayuki Shimizukawa <shimizukawa@gmail.com>2014-04-29 21:20:56 +0900
committerTakayuki Shimizukawa <shimizukawa@gmail.com>2014-04-29 21:20:56 +0900
commitce4d342e20739ab994a451f367d5bce2c5edb5d2 (patch)
tree025c7e7b7248a22c3ee04d413635c385fc5e8c49 /sphinx/util/jsdump.py
parentc3c879f2c63afbb39ad4d76ecc083cddd41d9946 (diff)
downloadsphinx-git-ce4d342e20739ab994a451f367d5bce2c5edb5d2.tar.gz
use six privided iteritems(),itervalues() to support py2/py3 in one source. refs #1350.
Diffstat (limited to 'sphinx/util/jsdump.py')
-rw-r--r--sphinx/util/jsdump.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/sphinx/util/jsdump.py b/sphinx/util/jsdump.py
index 709439a6a..41ef96c01 100644
--- a/sphinx/util/jsdump.py
+++ b/sphinx/util/jsdump.py
@@ -13,6 +13,7 @@
import re
import six
+from six import iteritems
from sphinx.util.pycompat import u
@@ -92,7 +93,7 @@ def dumps(obj, key=False):
return '{%s}' % ','.join('%s:%s' % (
dumps(key, True),
dumps(value)
- ) for key, value in obj.iteritems())
+ ) for key, value in iteritems(obj))
elif isinstance(obj, (tuple, list, set)):
return '[%s]' % ','.join(dumps(x) for x in obj)
elif isinstance(obj, six.string_types):