From c10dfac9909282b54a48be6261f76ba11d9da6d0 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sat, 23 Mar 2013 15:18:51 +0400 Subject: odict.py: remove usage of iteritems_compat which was not working I've added iteritems_compat function in one of my previous pull requests, which was failing with: ./markdown/odict.py:106: undefined name 'iteritems_compat' This commit drops usage of that function. --- markdown/odict.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/markdown/odict.py b/markdown/odict.py index 8089ece..68c1259 100644 --- a/markdown/odict.py +++ b/markdown/odict.py @@ -4,11 +4,6 @@ from . import util from copy import deepcopy -def iteritems_compat(d): - """Return an iterator over the (key, value) pairs of a dictionary. - Copied from `six` module.""" - return iter(getattr(d, _iteritems)()) - class OrderedDict(dict): """ A dictionary that keeps its keys in the order in which they're inserted. @@ -106,8 +101,8 @@ class OrderedDict(dict): return [self[k] for k in self.keyOrder] def update(self, dict_): - for k, v in iteritems_compat(dict_): - self[k] = v + for k in dict_: + self[k] = dict_[k] def setdefault(self, key, default): if key not in self: @@ -138,7 +133,7 @@ class OrderedDict(dict): Replaces the normal dict.__repr__ with a version that returns the keys in their Ordered order. """ - return '{%s}' % ', '.join(['%r: %r' % (k, v) for k, v in iteritems_compat(self)]) + return '{%s}' % ', '.join(['%r: %r' % (k, v) for k, v in self._iteritems()]) def clear(self): super(OrderedDict, self).clear() -- cgit v1.2.3