Merge pull request #3674 from jenshnielsen/text_warning

tacaswell · tacaswell · commit 78f1942f5af0 · 2014-10-19T11:46:27.000-04:00
ENH : Silince UnicodeWarnings in tests
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -3825,15 +3825,15 @@ def __init__(self, dataset, bw_method=None):
             raise ValueError("`dataset` input should have multiple elements.")
 
         self.dim, self.num_dp = np.array(self.dataset).shape
+        isString = isinstance(bw_method, six.string_types)
 
         if bw_method is None:
             pass
-        elif bw_method == 'scott':
+        elif (isString and bw_method == 'scott'):
             self.covariance_factor = self.scotts_factor
-        elif bw_method == 'silverman':
+        elif (isString and bw_method == 'silverman'):
             self.covariance_factor = self.silverman_factor
-        elif (np.isscalar(bw_method) and not
-              isinstance(bw_method, six.string_types)):
+        elif (np.isscalar(bw_method) and not isString):
                 self._bw_method = 'use constant'
                 self.covariance_factor = lambda: bw_method
         elif callable(bw_method):
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -8,7 +8,8 @@
 from matplotlib.testing.decorators import image_comparison, knownfailureif, cleanup
 import matplotlib.pyplot as plt
 import warnings
-from nose.tools import with_setup
+from nose import SkipTest
+from nose.tools import with_setup, assert_raises
 
 
 @image_comparison(baseline_images=['font_styles'])
@@ -236,3 +237,37 @@ def test_set_position():
 
     for a, b in zip(init_pos.min, post_pos.min):
         assert a + shift_val == b
+
+
+def test_get_rotation_string():
+    from matplotlib import text
+    assert text.get_rotation('horizontal') == 0.
+    assert text.get_rotation('vertical') == 90.
+    assert text.get_rotation('15.') == 15.
+
+
+def test_get_rotation_float():
+    from matplotlib import text
+    for i in [15., 16.70, 77.4]:
+        assert text.get_rotation(i) == i
+
+
+def test_get_rotation_int():
+    from matplotlib import text
+    for i in [67, 16, 41]:
+        assert text.get_rotation(i) == float(i)
+
+
+def test_get_rotation_raises():
+    from matplotlib import text
+    import sys
+    if sys.version_info[:2] < (2, 7):
+        raise SkipTest("assert_raises as context manager "
+                       "not supported with Python < 2.7")
+    with assert_raises(ValueError):
+        text.get_rotation('hozirontal')
+
+
+def test_get_rotation_none():
+    from matplotlib import text
+    assert text.get_rotation(None) == 0.0
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -49,15 +49,20 @@ def get_rotation(rotation):
 
     *rotation* may be 'horizontal', 'vertical', or a numeric value in degrees.
     """
-    if rotation in ('horizontal', None):
-        angle = 0.
-    elif rotation == 'vertical':
-        angle = 90.
-    else:
+    try:
         angle = float(rotation)
-    return angle % 360
-
+    except (ValueError, TypeError):
+        isString = isinstance(rotation, six.string_types)
+        if ((isString and rotation == 'horizontal') or rotation is None):
+            angle = 0.
+        elif (isString and rotation == 'vertical'):
+            angle = 90.
+        else:
+            raise ValueError("rotation is {0} expected either 'horizontal'"
+                             " 'vertical', numeric value or"
+                             "None".format(rotation))
 
+    return angle
 # these are not available for the object inspector until after the
 # class is build so we define an initial set here for the init
 # function and they will be overridden after object defn
