Merge branch 'v1.4.x' into master

Conflicts:
	lib/matplotlib/tests/test_coding_standards.py
	lib/matplotlib/tests/test_text.py

 - PEP8 conflicts in test_text.py
 - conflicts in test_coding_standards due to removal of
   test_text.py from list of known bad files which was
   moved around in the file.

Author: tacaswell

lib/matplotlib/colors.py

@@ -1177,16 +1177,18 @@ def __call__(self, value, clip=None):
         elif vmin == vmax:
             result.fill(0)
         else:
+            res_mask = result.data < 0
             if clip:
                 mask = ma.getmask(result)
-                val = ma.array(np.clip(result.filled(vmax), vmin, vmax),
-                                mask=mask)
+                result = ma.array(np.clip(result.filled(vmax), vmin, vmax),
+                                  mask=mask)
             resdat = result.data
             resdat -= vmin
             np.power(resdat, gamma, resdat)
             resdat /= (vmax - vmin) ** gamma
+
             result = np.ma.array(resdat, mask=result.mask, copy=False)
-            result[value < 0] = 0
+            result[res_mask] = 0
         if is_scalar:
             result = result[0]
         return result

lib/matplotlib/image.py

@@ -114,7 +114,7 @@ def __init__(self, ax,
     def __getstate__(self):
         state = super(_AxesImageBase, self).__getstate__()
         # We can't pickle the C Image cached object.
-        state.pop('_imcache', None)
+        state['_imcache'] = None
         return state
 
     def get_size(self):

lib/matplotlib/tests/test_coding_standards.py

@@ -214,7 +214,6 @@ def test_pep8_conformance_installed_files():
                           'tests/test_spines.py',
                           'tests/test_streamplot.py',
                           'tests/test_subplots.py',
-                          'tests/test_text.py',
                           'tests/test_tightlayout.py',
                           'tests/test_transforms.py',
                           'tests/test_triangulation.py',

lib/matplotlib/tests/test_colors.py

@@ -5,7 +5,7 @@
 import itertools
 from distutils.version import LooseVersion as V
 
-from nose.tools import assert_raises
+from nose.tools import assert_raises, assert_equal
 
 import numpy as np
 from numpy.testing.utils import assert_array_equal, assert_array_almost_equal
@@ -66,11 +66,29 @@ def test_PowerNorm():
     assert_array_almost_equal(norm(a), pnorm(a))
 
     a = np.array([-0.5, 0, 2, 4, 8], dtype=np.float)
-    expected = [0, 0, 1./16, 1./4, 1]
+    expected = [0, 0, 1/16, 1/4, 1]
     pnorm = mcolors.PowerNorm(2, vmin=0, vmax=8)
     assert_array_almost_equal(pnorm(a), expected)
+    assert_equal(pnorm(a[0]), expected[0])
+    assert_equal(pnorm(a[2]), expected[2])
     assert_array_almost_equal(a[1:], pnorm.inverse(pnorm(a))[1:])
 
+    # Clip = True
+    a = np.array([-0.5, 0, 1, 8, 16], dtype=np.float)
+    expected = [0, 0, 0, 1, 1]
+    pnorm = mcolors.PowerNorm(2, vmin=2, vmax=8, clip=True)
+    assert_array_almost_equal(pnorm(a), expected)
+    assert_equal(pnorm(a[0]), expected[0])
+    assert_equal(pnorm(a[-1]), expected[-1])
+
+    # Clip = True at call time
+    a = np.array([-0.5, 0, 1, 8, 16], dtype=np.float)
+    expected = [0, 0, 0, 1, 1]
+    pnorm = mcolors.PowerNorm(2, vmin=2, vmax=8, clip=False)
+    assert_array_almost_equal(pnorm(a, clip=True), expected)
+    assert_equal(pnorm(a[0], clip=True), expected[0])
+    assert_equal(pnorm(a[-1], clip=True), expected[-1])
+
 
 def test_Normalize():
     norm = mcolors.Normalize()