Merge pull request #1642 from tacaswell/remove_import_new

dmcdougall · dmcdougall · commit 0179481cfc7e · 2013-01-16T17:48:50.000-08:00
remove `import new` from cbook.py
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -28,10 +28,9 @@
 import numpy.ma as ma
 
 
-if sys.version_info[0] >= 3:
-    import types
-else:
-    import new
+
+import types
+
 
 # On some systems, locale.getpreferredencoding returns None,
 # which can break unicode; and the sage project reports that
@@ -209,10 +208,9 @@ def __call__(self, *args, **kwargs):
         elif self.inst is not None:
             # build a new instance method with a strong reference to the
             # instance
-            if sys.version_info[0] >= 3:
-                mtd = types.MethodType(self.func, self.inst())
-            else:
-                mtd = new.instancemethod(self.func, self.inst(), self.klass)
+
+            mtd = types.MethodType(self.func, self.inst())
+
         else:
             # not a bound method, just return the func
             mtd = self.func
