{,test_}ticker.py: small simplifications

doronbehar · doronbehar · commit 264652704de9 · 2024-10-13T00:12:48.000+03:00
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -1626,11 +1626,10 @@ def test_engformatter_offset_oom(
 ):
     UNIT = "eV"
     # Doesn't really matter here, but should be of order of magnitude ~= 1
-    r = range(-5, 7)
     fig, ax = plt.subplots()
     # Use some random ugly number
     data_offset = 2.7149*10**oom_center
-    ydata = data_offset + np.array(r, dtype=float)*10**oom_noise
+    ydata = data_offset + np.arange(-5, 7, dtype=float)*10**oom_noise
     ax.plot(ydata)
     formatter = mticker.EngFormatter(useOffset=True, unit=UNIT)
     # So that offset strings will always have the same size
@@ -1664,10 +1663,7 @@ def test_engformatter_offset_oom(
         for tick in ticks_got:
             # 0 is zero on all orders of magnitudes, no matter what is
             # oom_noise_desired
-            if tick[0] == "0":
-                prefix_idx = 0
-            else:
-                prefix_idx = oom_noise_desired
+            prefix_idx = 0 if tick[0] == "0" else oom_noise_desired
             assert tick.endswith(formatter.ENG_PREFIXES[prefix_idx] + UNIT)
 
 
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -468,10 +468,7 @@ def get_usetex(self):
         return self._usetex
 
     def set_usetex(self, val):
-        if val is None:
-            self._usetex = mpl.rcParams['text.usetex']
-        else:
-            self._usetex = val
+        self._usetex = mpl._val_or_rc(val, 'text.usetex')
 
     usetex = property(fget=get_usetex, fset=set_usetex)
 
@@ -1445,7 +1442,7 @@ def __call__(self, x, pos=None):
     def set_locs(self, locs):
         # docstring inherited
         self.locs = locs
-        if len(self.locs) > 0:
+        if self.locs:
             vmin, vmax = sorted(self.axis.get_view_interval())
             if self._useOffset:
                 self._compute_offset()
@@ -1472,19 +1469,14 @@ def get_offset(self):
         if len(self.locs) == 0:
             return ''
         if self.offset:
-            offsetStr = ''
-            if self.offset:
-                offsetStr = self.format_data(self.offset)
-                if self.offset > 0:
-                    offsetStr = '+' + offsetStr
+            offsetStr = self.format_data(self.offset)
+            if self.offset > 0:
+                offsetStr = '+' + offsetStr
             sciNotStr = self.format_data(10 ** self.orderOfMagnitude)
             if self._useMathText or self._usetex:
                 if sciNotStr != '':
                     sciNotStr = r'\times%s' % sciNotStr
-                s = fr'${sciNotStr}{offsetStr}$'
-            else:
-                s = ''.join((sciNotStr, offsetStr))
-            return self.fix_minus(s)
+            return self.fix_minus(f'${sciNotStr}{offsetStr}$')
         return ''
 
     def format_eng(self, num):
