Permalink
Browse files

Merge pull request #1053 from takluyver/move_py3k_reload

Move Python 3 import of reload() to the module that uses it
  • Loading branch information...
2 parents 792972d + 4b08cf1 commit bd5ca3338d3cc012ecf7070966ac6c74c8186893 @WeatherGod WeatherGod committed Aug 1, 2012
Showing with 6 additions and 6 deletions.
  1. +6 −0 lib/matplotlib/__init__.py
  2. +0 −6 lib/matplotlib/pyplot.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:
View
@@ -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

0 comments on commit bd5ca33

Please sign in to comment.