Merge pull request #1053 from takluyver/move_py3k_reload

WeatherGod · WeatherGod · commit bd5ca3338d3c · 2012-08-01T08:17:53.000-07:00
Move Python 3 import of reload() to the module that uses it
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -106,6 +106,12 @@
 import distutils.sysconfig
 import distutils.version
 
+try:
+    reload
+except NameError:
+    # Python 3
+    from imp import reload
+
 # Needed for toolkit setuptools support
 if 0:
     try:
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -55,12 +55,6 @@
            LinearLocator, LogLocator, AutoLocator, MultipleLocator,\
            MaxNLocator
 
-try:
-    reload
-except NameError:
-    # Python 3
-    from imp import reload
-
 ## Backend detection ##
 def _backend_selection():
     """ If rcParams['backend_fallback'] is true, check to see if the
