Remove mostly unused utils_extra.py

astrofrog · astrofrog · commit 80850f563f34 · 2016-11-06T16:43:04.000Z
diff --git a/sphinx_automodapi/tests/test_automodapi.py b/sphinx_automodapi/tests/test_automodapi.py
@@ -6,7 +6,7 @@
 import pytest
 
 from . import *
-from ..utils_extra import iteritems
+from ..utils import iteritems
 
 pytest.importorskip('sphinx')  # skips these tests if sphinx not present
 
diff --git a/sphinx_automodapi/tests/test_automodsumm.py b/sphinx_automodapi/tests/test_automodsumm.py
@@ -5,7 +5,7 @@
 import pytest
 
 from . import *
-from ..utils_extra import iteritems
+from ..utils import iteritems
 
 pytest.importorskip('sphinx')  # skips these tests if sphinx not present
 
diff --git a/sphinx_automodapi/utils.py b/sphinx_automodapi/utils.py
@@ -7,6 +7,14 @@
 from sphinx.ext.autosummary.generate import find_autosummary_in_docstring
 
 
+if sys.version_info[0] >= 3:
+    def iteritems(dictionary):
+        return dictionary.items()
+else:
+    def iteritems(dictionary):
+        return dictionary.iteritems()
+
+
 def find_mod_objs(modname, onlylocals=False):
     """ Returns all the public attributes of a module referenced by name.
 
diff --git a/sphinx_automodapi/utils_extra.py b/sphinx_automodapi/utils_extra.py
