changed order, remove braces on if and changed error message

prasadve · prasadve · commit a69db445d32f · 2020-04-01T21:04:07.000-04:00
diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py
@@ -988,28 +988,27 @@ def set_thetalim(self, *args, **kwargs):
         wrapped in to the range :math:`[0, 2\pi]` (in radians), so for example
         it is possible to do ``set_thetalim(-np.pi / 2, np.pi / 2)`` to have
         an axes symmetric around 0. A ValueError is raised if the absolute
-        angle difference is larger than :math:2\pi.
+        angle difference is larger than :math:`2\pi`.
         """
         thetamin = None
         thetamax = None
         left = None
         right = None
 
+        if len(args) == 2:
+            if args[0] is not None and args[1] is not None:
+                left, right = args
+                if abs(right - left) > 2 * np.pi:
+                    raise ValueError('The angle range must be <= 2 pi')
+
         if 'thetamin' in kwargs:
             thetamin = np.deg2rad(kwargs.pop('thetamin'))
         if 'thetamax' in kwargs:
             thetamax = np.deg2rad(kwargs.pop('thetamax'))
 
-        if len(args) == 2:
-            if args[0] is not None and args[1] is not None:
-                left = args[0]
-                right = args[1]
-                if(abs(right - left) > 2 * np.pi):
-                    raise ValueError('Cannot pass angle range > 2 pi')
-
-        if(thetamin is not None and thetamax is not None):
-            if(abs(thetamax - thetamin) > 2 * np.pi):
-                raise ValueError('Cannot pass angle range > 2 pi')
+        if thetamin is not None and thetamax is not None:
+            if abs(thetamax - thetamin) > 2 * np.pi:
+                raise ValueError('The angle range must be<= 360 degrees')
         return tuple(np.rad2deg(self.set_xlim(left=left, right=right,
                                               xmin=thetamin, xmax=thetamax)))
 
diff --git a/lib/matplotlib/tests/test_subplots.py b/lib/matplotlib/tests/test_subplots.py
@@ -176,7 +176,7 @@ def test_dont_mutate_kwargs():
 
 
 def test_subplot_theta_min_max_raise():
-    with pytest.raises(ValueError, match="Cannot pass angle range > 2 pi"):
+    with pytest.raises(ValueError, match='The angle range must be<= 360 degrees'):
         ax = plt.subplot(111, projection='polar')
         ax.set_thetalim(thetamin=800, thetamax=400)
 
@@ -187,7 +187,7 @@ def test_subplot_theta_min_max_non_raise():
 
 
 def test_subplot_theta_range_raise():
-    with pytest.raises(ValueError, match="Cannot pass angle range > 2 pi"):
+    with pytest.raises(ValueError, match='The angle range must be <= 2 pi'):
         ax = plt.subplot(111, projection='polar')
         ax.set_thetalim(0, 3 * numpy.pi)
 
