Merge pull request #8331 from anntzer/dont-use-__builtins__

NelleV · QuLogic · commit 64b9ecea2f1c · 2017-03-27T00:57:30.000-04:00
Don't index into __builtins__ (not supported by PyPy).
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -6062,6 +6062,10 @@ def hist(self, x, bins=None, range=None, normed=False, weights=None,
         .. plot:: mpl_examples/statistics/histogram_demo_features.py
 
         """
+        # Avoid shadowing the builtin.
+        bin_range = range
+        del range
+
         def _normalize_input(inp, ename='input'):
             """Normalize 1 or 2d input into list of np.ndarray or
             a single 2D np.ndarray.
@@ -6106,13 +6110,6 @@ def _normalize_input(inp, ename='input'):
         if bins is None:
             bins = rcParams['hist.bins']
 
-        # xrange becomes range after 2to3
-        bin_range = range
-        range = __builtins__["range"]
-
-        # NOTE: the range keyword overwrites the built-in func range !!!
-        #       needs to be fixed in numpy                           !!!
-
         # Validate string inputs here so we don't have to clutter
         # subsequent code.
         if histtype not in ['bar', 'barstacked', 'step', 'stepfilled']:
@@ -6478,10 +6475,7 @@ def hist2d(self, x, y, bins=10, range=None, normed=False, weights=None,
         .. plot:: mpl_examples/pylab_examples/hist2d_demo.py
         """
 
-        # xrange becomes range after 2to3
-        bin_range = range
-        range = __builtins__["range"]
-        h, xedges, yedges = np.histogram2d(x, y, bins=bins, range=bin_range,
+        h, xedges, yedges = np.histogram2d(x, y, bins=bins, range=range,
                                            normed=normed, weights=weights)
 
         if cmin is not None:
