Skip to content

Commit 0546715

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'matplotlib/v2.x'
2 parents 4e1792b + 6d161d6 commit 0546715

File tree

6 files changed

+82
-68
lines changed

6 files changed

+82
-68
lines changed

‎lib/matplotlib/axes/_axes.py

+39-41
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
import matplotlib.cbook as cbook
1818
from matplotlib.cbook import (mplDeprecation, STEP_LOOKUP_MAP,
19-
iterable, is_string_like)
19+
iterable, is_string_like,
20+
safe_first_element)
2021
import matplotlib.collections as mcoll
2122
import matplotlib.colors as mcolors
2223
import matplotlib.contour as mcontour
@@ -2904,29 +2905,44 @@ def xywhere(xs, ys, mask):
29042905
if key in kwargs:
29052906
plot_kw[key] = kwargs[key]
29062907

2907-
if xerr is not None:
2908-
if (iterable(xerr) and len(xerr) == 2 and
2909-
iterable(xerr[0]) and iterable(xerr[1])):
2910-
# using list comps rather than arrays to preserve units
2911-
left = [thisx - thiserr for (thisx, thiserr)
2912-
in cbook.safezip(x, xerr[0])]
2913-
right = [thisx + thiserr for (thisx, thiserr)
2914-
in cbook.safezip(x, xerr[1])]
2915-
else:
2916-
# Check if xerr is scalar or symmetric. Asymmetric is handled
2917-
# above. This prevents Nx2 arrays from accidentally
2918-
# being accepted, when the user meant the 2xN transpose.
2919-
# special case for empty lists
2920-
if len(xerr) > 1 and not ((len(xerr) == len(x) and not (
2921-
iterable(xerr[0]) and len(xerr[0]) > 1))):
2922-
raise ValueError("xerr must be a scalar, the same "
2908+
def extract_err(err, data):
2909+
'''private function to compute error bars
2910+
2911+
Parameters
2912+
----------
2913+
err : iterable
2914+
xerr or yerr from errorbar
2915+
data : iterable
2916+
x or y from errorbar
2917+
'''
2918+
if (iterable(err) and len(err) == 2):
2919+
a, b = err
2920+
if iterable(a) and iterable(b):
2921+
# using list comps rather than arrays to preserve units
2922+
low = [thisx - thiserr for (thisx, thiserr)
2923+
in cbook.safezip(data, a)]
2924+
high = [thisx + thiserr for (thisx, thiserr)
2925+
in cbook.safezip(data, b)]
2926+
return low, high
2927+
# Check if xerr is scalar or symmetric. Asymmetric is handled
2928+
# above. This prevents Nx2 arrays from accidentally
2929+
# being accepted, when the user meant the 2xN transpose.
2930+
# special case for empty lists
2931+
if len(err) > 1:
2932+
fe = safe_first_element(err)
2933+
if not ((len(err) == len(data) and not (iterable(fe) and
2934+
len(fe) > 1))):
2935+
raise ValueError("err must be a scalar, the same "
29232936
"dimensions as x, or 2xN.")
2924-
# using list comps rather than arrays to preserve units
2925-
left = [thisx - thiserr for (thisx, thiserr)
2926-
in cbook.safezip(x, xerr)]
2927-
right = [thisx + thiserr for (thisx, thiserr)
2928-
in cbook.safezip(x, xerr)]
2937+
# using list comps rather than arrays to preserve units
2938+
low = [thisx - thiserr for (thisx, thiserr)
2939+
in cbook.safezip(data, err)]
2940+
high = [thisx + thiserr for (thisx, thiserr)
2941+
in cbook.safezip(data, err)]
2942+
return low, high
29292943

2944+
if xerr is not None:
2945+
left, right = extract_err(xerr, x)
29302946
# select points without upper/lower limits in x and
29312947
# draw normal errorbars for these points
29322948
noxlims = ~(xlolims | xuplims)
@@ -2971,25 +2987,7 @@ def xywhere(xs, ys, mask):
29712987
caplines.extend(self.plot(xup, yup, 'k|', **plot_kw))
29722988

29732989
if yerr is not None:
2974-
if (iterable(yerr) and len(yerr) == 2 and
2975-
iterable(yerr[0]) and iterable(yerr[1])):
2976-
# using list comps rather than arrays to preserve units
2977-
lower = [thisy - thiserr for (thisy, thiserr)
2978-
in cbook.safezip(y, yerr[0])]
2979-
upper = [thisy + thiserr for (thisy, thiserr)
2980-
in cbook.safezip(y, yerr[1])]
2981-
else:
2982-
# Check for scalar or symmetric, as in xerr.
2983-
if len(yerr) > 1 and not ((len(yerr) == len(y) and not (
2984-
iterable(yerr[0]) and len(yerr[0]) > 1))):
2985-
raise ValueError("yerr must be a scalar, the same "
2986-
"dimensions as y, or 2xN.")
2987-
# using list comps rather than arrays to preserve units
2988-
lower = [thisy - thiserr for (thisy, thiserr)
2989-
in cbook.safezip(y, yerr)]
2990-
upper = [thisy + thiserr for (thisy, thiserr)
2991-
in cbook.safezip(y, yerr)]
2992-
2990+
lower, upper = extract_err(yerr, y)
29932991
# select points without upper/lower limits in y and
29942992
# draw normal errorbars for these points
29952993
noylims = ~(lolims | uplims)

‎lib/matplotlib/axis.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -2024,8 +2024,7 @@ def get_tick_space(self):
20242024
# There is a heuristic here that the aspect ratio of tick text
20252025
# is no more than 3:1
20262026
size = tick.label1.get_size() * 3
2027-
size *= np.cos(np.deg2rad(tick.label1.get_rotation()))
2028-
return np.floor(length / size)
2027+
return int(np.floor(length / size))
20292028

20302029

20312030
class YAxis(Axis):
@@ -2364,5 +2363,4 @@ def get_tick_space(self):
23642363
tick = self._get_tick(True)
23652364
# Having a spacing of at least 2 just looks good.
23662365
size = tick.label1.get_size() * 2.0
2367-
size *= np.cos(np.deg2rad(tick.label1.get_rotation()))
2368-
return np.floor(length / size)
2366+
return int(np.floor(length / size))

‎lib/matplotlib/colorbar.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,10 @@ def _ticker(self):
581581
elif isinstance(self.norm, colors.LogNorm):
582582
locator = ticker.LogLocator()
583583
else:
584-
locator = ticker.MaxNLocator()
584+
if mpl.rcParams['_internal.classic_mode']:
585+
locator = ticker.MaxNLocator()
586+
else:
587+
locator = ticker.AutoLocator()
585588
else:
586589
b = self._boundaries[self._inside]
587590
locator = ticker.FixedLocator(b, nbins=10)

‎lib/matplotlib/mlab.py

+7-22
Original file line numberDiff line numberDiff line change
@@ -3185,35 +3185,20 @@ def get_type(item, atype=int):
31853185
return atype
31863186

31873187
def get_justify(colname, column, precision):
3188-
ntype = type(column[0])
3188+
ntype = column.dtype
31893189

3190-
if (ntype == np.str or ntype == np.str_ or ntype == np.string0 or
3191-
ntype == np.string_):
3192-
length = max(len(colname), column.itemsize)
3190+
if np.issubdtype(ntype, str) or np.issubdtype(ntype, bytes):
3191+
# The division below handles unicode stored in array, which could
3192+
# have 4 bytes per char
3193+
length = max(len(colname), column.itemsize // column[0].itemsize)
31933194
return 0, length+padding, "%s" # left justify
31943195

3195-
if (ntype == np.int or ntype == np.int16 or ntype == np.int32 or
3196-
ntype == np.int64 or ntype == np.int8 or ntype == np.int_):
3196+
if np.issubdtype(ntype, np.int):
31973197
length = max(len(colname),
31983198
np.max(list(map(len, list(map(str, column))))))
31993199
return 1, length+padding, "%d" # right justify
32003200

3201-
# JDH: my powerbook does not have np.float96 using np 1.3.0
3202-
"""
3203-
In [2]: np.__version__
3204-
Out[2]: '1.3.0.dev5948'
3205-
3206-
In [3]: !uname -a
3207-
Darwin Macintosh-5.local 9.4.0 Darwin Kernel Version 9.4.0: Mon Jun
3208-
9 19:30:53 PDT 2008; root:xnu-1228.5.20~1/RELEASE_I386 i386 i386
3209-
3210-
In [4]: np.float96
3211-
---------------------------------------------------------------------------
3212-
AttributeError Traceback (most recent call la
3213-
"""
3214-
if (ntype == np.float or ntype == np.float32 or ntype == np.float64 or
3215-
(hasattr(np, 'float96') and (ntype == np.float96)) or
3216-
ntype == np.float_):
3201+
if np.issubdtype(ntype, np.float):
32173202
fmt = "%." + str(precision) + "f"
32183203
length = max(
32193204
len(colname),

‎lib/matplotlib/tests/test_axes.py

+14
Original file line numberDiff line numberDiff line change
@@ -4341,6 +4341,20 @@ def test_pandas_indexing_dates():
43414341
ax.plot('dates', 'values', data=without_zero_index)
43424342

43434343

4344+
@cleanup
4345+
def test_pandas_errorbar_indexing():
4346+
try:
4347+
import pandas as pd
4348+
except ImportError:
4349+
raise SkipTest("Pandas not installed")
4350+
4351+
df = pd.DataFrame(np.random.uniform(size=(5, 4)),
4352+
columns=['x', 'y', 'xe', 'ye'],
4353+
index=[1, 2, 3, 4, 5])
4354+
fig, ax = plt.subplots()
4355+
ax.errorbar('x', 'y', xerr='xe', yerr='ye', data=df)
4356+
4357+
43444358
@cleanup
43454359
def test_pandas_indexing_hist():
43464360
try:

‎lib/matplotlib/tests/test_mlab.py

+16
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,22 @@ def test_csv2rec_yearfirst(self):
393393
assert_array_equal(array['a'].tolist(), expected)
394394

395395

396+
class rec2txt_testcase(CleanupTestCase):
397+
def test_csv2txt_basic(self):
398+
# str() calls around field names necessary b/c as of numpy 1.11
399+
# dtype doesn't like unicode names (caused by unicode_literals import)
400+
a = np.array([(1.0, 2, 'foo', 'bing'),
401+
(2.0, 3, 'bar', 'blah')],
402+
dtype=np.dtype([(str('x'), np.float32),
403+
(str('y'), np.int8),
404+
(str('s'), str, 3),
405+
(str('s2'), str, 4)]))
406+
truth = (' x y s s2\n'
407+
' 1.000 2 foo bing \n'
408+
' 2.000 3 bar blah ')
409+
assert_equal(mlab.rec2txt(a), truth)
410+
411+
396412
class window_testcase(CleanupTestCase):
397413
def setUp(self):
398414
np.random.seed(0)

0 commit comments

Comments
 (0)