Merge pull request #2334 from andreabedini/patch-4

mdboom · mdboom · commit 57ea2604ae5e · 2013-08-26T09:24:16.000-07:00
Remove disabled code.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -150,12 +150,6 @@ def _forward_ilshift(self, other):
     # Python 3
     from imp import reload
 
-# Needed for toolkit setuptools support
-if 0:
-    try:
-        __import__('pkg_resources').declare_namespace(__name__)
-    except ImportError:
-        pass # must not have setuptools
 
 if not hasattr(sys, 'argv'):  # for modpython
     sys.argv = ['modpython']
