Move override_builtins test to regression testing framework. Fix a new bug this regression test found by overriding "bytes" on Python >= 2.6.

mdboom · mdboom · commit bbaeac7280d5 · 2011-04-04T14:11:32.000-04:00
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -292,3 +292,6 @@ def save(*args, **kwargs):
 
 # don't let numpy's datetime hide stdlib
 import datetime
+
+if sys.version_info > (2, 6, 0):
+    bytes = __builtins__['bytes']
diff --git a/lib/matplotlib/tests/test_basic.py b/lib/matplotlib/tests/test_basic.py
@@ -1,9 +1,31 @@
 from nose.tools import assert_equal
 from matplotlib.testing.decorators import knownfailureif
+import sys
 
 def test_simple():
     assert_equal(1+1,2)
 
 @knownfailureif(True)
 def test_simple_knownfail():
     assert_equal(1+1,3)
+
+from pylab import *
+def test_override_builtins():
+    ok_to_override = set([
+        '__name__',
+        '__doc__',
+        '__package__',
+        'any',
+        'all',
+        'sum'
+    ])
+
+    overridden = False
+    for key in globals().keys():
+        if key in dir(sys.modules["__builtin__"]):
+            if (globals()[key] != getattr(sys.modules["__builtin__"], key) and
+                key not in ok_to_override):
+                print "'%s' was overridden in globals()." % key
+                overridden = True
+
+    assert not overridden
diff --git a/unit/override_builtins.py b/unit/override_builtins.py
