Commit 2646527
committed
{,test_}ticker.py: small simplifications
1 parent eb56caa commit 2646527
2 files changed
Lines changed: 8 additions & 20 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1626,11 +1626,10 @@ def test_engformatter_offset_oom( | |||
| 1626 | 1626 | ): | |
| 1627 | 1627 | UNIT = "eV" | |
| 1628 | 1628 | # Doesn't really matter here, but should be of order of magnitude ~= 1 | |
| 1629 | - r = range(-5, 7) | ||
| 1630 | 1629 | fig, ax = plt.subplots() | |
| 1631 | 1630 | # Use some random ugly number | |
| 1632 | 1631 | data_offset = 2.7149*10**oom_center | |
| 1633 | - ydata = data_offset + np.array(r, dtype=float)*10**oom_noise | ||
| 1632 | + ydata = data_offset + np.arange(-5, 7, dtype=float)*10**oom_noise | ||
| 1634 | 1633 | ax.plot(ydata) | |
| 1635 | 1634 | formatter = mticker.EngFormatter(useOffset=True, unit=UNIT) | |
| 1636 | 1635 | # So that offset strings will always have the same size | |
@@ -1664,10 +1663,7 @@ def test_engformatter_offset_oom( | |||
| 1664 | 1663 | for tick in ticks_got: | |
| 1665 | 1664 | # 0 is zero on all orders of magnitudes, no matter what is | |
| 1666 | 1665 | # oom_noise_desired | |
| 1667 | - if tick[0] == "0": | ||
| 1668 | - prefix_idx = 0 | ||
| 1669 | - else: | ||
| 1670 | - prefix_idx = oom_noise_desired | ||
| 1666 | + prefix_idx = 0 if tick[0] == "0" else oom_noise_desired | ||
| 1671 | 1667 | assert tick.endswith(formatter.ENG_PREFIXES[prefix_idx] + UNIT) | |
| 1672 | 1668 | ||
| 1673 | 1669 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -468,10 +468,7 @@ def get_usetex(self): | |||
| 468 | 468 | return self._usetex | |
| 469 | 469 | ||
| 470 | 470 | def set_usetex(self, val): | |
| 471 | - if val is None: | ||
| 472 | - self._usetex = mpl.rcParams['text.usetex'] | ||
| 473 | - else: | ||
| 474 | - self._usetex = val | ||
| 471 | + self._usetex = mpl._val_or_rc(val, 'text.usetex') | ||
| 475 | 472 | ||
| 476 | 473 | usetex = property(fget=get_usetex, fset=set_usetex) | |
| 477 | 474 | ||
@@ -1445,7 +1442,7 @@ def __call__(self, x, pos=None): | |||
| 1445 | 1442 | def set_locs(self, locs): | |
| 1446 | 1443 | # docstring inherited | |
| 1447 | 1444 | self.locs = locs | |
| 1448 | - if len(self.locs) > 0: | ||
| 1445 | + if self.locs: | ||
| 1449 | 1446 | vmin, vmax = sorted(self.axis.get_view_interval()) | |
| 1450 | 1447 | if self._useOffset: | |
| 1451 | 1448 | self._compute_offset() | |
@@ -1472,19 +1469,14 @@ def get_offset(self): | |||
| 1472 | 1469 | if len(self.locs) == 0: | |
| 1473 | 1470 | return '' | |
| 1474 | 1471 | if self.offset: | |
| 1475 | - offsetStr = '' | ||
| 1476 | - if self.offset: | ||
| 1477 | - offsetStr = self.format_data(self.offset) | ||
| 1478 | - if self.offset > 0: | ||
| 1479 | - offsetStr = '+' + offsetStr | ||
| 1472 | + offsetStr = self.format_data(self.offset) | ||
| 1473 | + if self.offset > 0: | ||
| 1474 | + offsetStr = '+' + offsetStr | ||
| 1480 | 1475 | sciNotStr = self.format_data(10 ** self.orderOfMagnitude) | |
| 1481 | 1476 | if self._useMathText or self._usetex: | |
| 1482 | 1477 | if sciNotStr != '': | |
| 1483 | 1478 | sciNotStr = r'\times%s' % sciNotStr | |
| 1484 | - s = fr'${sciNotStr}{offsetStr}$' | ||
| 1485 | - else: | ||
| 1486 | - s = ''.join((sciNotStr, offsetStr)) | ||
| 1487 | - return self.fix_minus(s) | ||
| 1479 | + return self.fix_minus(f'${sciNotStr}{offsetStr}$') | ||
| 1488 | 1480 | return '' | |
| 1489 | 1481 | ||
| 1490 | 1482 | def format_eng(self, num): | |
0 commit comments