8000 Merge remote-tracking branch 'upstream/v1.2.x' · matplotlib/matplotlib@5448d5b · GitHub
[go: up one dir, main page]
Skip to content

Commit 5448d5b

Browse files
mdboommdboom
committed
Merge remote-tracking branch 'upstream/v1.2.x'
Conflicts: lib/matplotlib/tests/baseline_images/test_axes/formatter_large_small.pdf lib/matplotlib/tests/baseline_images/test_axes/formatter_large_small.png
2 parents cda4f0d + dadb035 commit 5448d5b

File tree

5 files changed

+56
-59
lines changed

5 files changed

+56
-59
lines changed

‎lib/matplotlib/tests/baseline_images/test_axes/formatter_large_small.pdf

-61 Bytes
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_axes/formatter_large_small.png

-1.08 KB
Loading

‎lib/matplotlib/tests/baseline_images/test_axes/formatter_large_small.svg

Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def test_formatter_large_small():
7474
# github issue #617, pull #619
7575
fig, ax = plt.subplots(1)
7676
x = [0.500000001, 0.500000002]
77-
y = [500000001, 500000002]
77+
y = [1e64, 1.1e64]
7878
ax.plot(x, y)
7979

8080
@image_comparison(baseline_images=["twin_axis_locaters_formatters"])
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ def _set_format(self, vmin, vmax):
536536
_locs = list(self.locs) + [vmin, vmax]
537537
else:
538538
_locs = self.locs
539-
locs = (np.asarray(_locs) - self.offset) / 10 ** self.orderOfMagnitude
539+
locs = (np.asarray(_locs) - self.offset) / 10. ** self.orderOfMagnitude
540540
loc_range = np.ptp(locs)
541541
if len(self.locs) < 2:
542542
# We needed the end points only for the loc_range calculation.
@@ -559,7 +559,7 @@ def _set_format(self, vmin, vmax):
559559
self.format = '$\mathdefault{%s}$' % self.format
560560

561561
def pprint_val(self, x):
562-
xp = (x - self.offset) / (10 ** self.orderOfMagnitude)
562+
xp = (x - self.offset) / (10. ** self.orderOfMagnitude)
563563
if np.absolute(xp) < 1e-8:
564564
xp = 0
565565
if self._useLocale: