Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit78f2e40

Browse files
authored
Merge pull request#16521 from timhoffm/remove-3.1-deprecations5
API: Remove more API deprecated in 3.1.
2 parents1d9a8a3 +7317118 commit78f2e40

File tree

5 files changed

+24
-201
lines changed

5 files changed

+24
-201
lines changed

‎doc/api/next_api_changes/removals.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ Classes and methods
3939
- ``backend_qt5.NavigationToolbar2QT.buttons`` property (no replacement)
4040
- ``backend_qt5.NavigationToolbar2QT.adj_window`` property (no replacement)
4141

42+
- ``docstring.Appender`` (no replacement)
43+
- ``docstring.dedent()`` (use `inspect.getdoc` instead)
44+
- ``docstring.copy_dedent()``
45+
(use ``docstring.copy()`` and `inspect.getdoc` instead)
46+
4247
- ``matplotlib.checkdep_dvipng`` (no replacement)
4348
- ``matplotlib.checkdep_ghostscript`` (no replacement)
4449
- ``matplotlib.checkdep_pdftops`` (no replacement)
@@ -59,6 +64,21 @@ Classes and methods
5964
- ``sphinxext.mathmpl.math_directive()``
6065
(use the class ``MathDirective`` instead)
6166

67+
- ``scale.LogTransformBase`` (use ``scale.LogTransform`` instead)
68+
- ``scale.InvertedLogTransformBase`` (use ``scale.InvertedLogTransform`` instead)
69+
- ``scale.Log10Transform`` (use ``scale.LogTransform`` instead)
70+
- ``scale.InvertedLog10Transform`` (use ``scale.InvertedLogTransform`` instead)
71+
- ``scale.Log2Transform`` (use ``scale.LogTransform`` instead)
72+
- ``scale.InvertedLog2Transform`` (use ``scale.InvertedLogTransform`` instead)
73+
- ``scale.NaturalLogTransform`` (use ``scale.LogTransform`` instead)
74+
- ``scale.InvertedNaturalLogTransform`` (use ``scale.InvertedLogTransform`` instead)
75+
76+
- ``ticker.OldScalarFormatter.pprint_val()`` (no replacement)
77+
- ``ticker.ScalarFormatter.pprint_val()`` (no replacement)
78+
- ``ticker.LogFormatter.pprint_val()`` (no replacement)
79+
- ``ticker.decade_down()`` (no replacement)
80+
- ``ticker.decade_up()`` (no replacement)
81+
6282
- ``Artist.aname`` property (no replacement)
6383
- ``Axis.iter_ticks`` (no replacement)
6484

‎lib/matplotlib/docstring.py

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
importinspect
22

3-
frommatplotlibimportcbook
4-
53

64
classSubstitution:
75
"""
@@ -59,43 +57,6 @@ def from_params(cls, params):
5957
returnresult
6058

6159

62-
@cbook.deprecated("3.1")
63-
classAppender:
64-
r"""
65-
A function decorator that will append an addendum to the docstring
66-
of the target function.
67-
68-
This decorator should be robust even if func.__doc__ is None
69-
(for example, if -OO was passed to the interpreter).
70-
71-
Usage: construct a docstring.Appender with a string to be joined to
72-
the original docstring. An optional 'join' parameter may be supplied
73-
which will be used to join the docstring and addendum. e.g.
74-
75-
add_copyright = Appender("Copyright (c) 2009", join='\n')
76-
77-
@add_copyright
78-
def my_dog(has='fleas'):
79-
"This docstring will have a copyright below"
80-
pass
81-
"""
82-
def__init__(self,addendum,join=''):
83-
self.addendum=addendum
84-
self.join=join
85-
86-
def__call__(self,func):
87-
docitems= [func.__doc__,self.addendum]
88-
func.__doc__=func.__doc__andself.join.join(docitems)
89-
returnfunc
90-
91-
92-
@cbook.deprecated("3.1",alternative="inspect.getdoc()")
93-
defdedent(func):
94-
"""Dedent a docstring (if present)."""
95-
func.__doc__=func.__doc__andcbook.dedent(func.__doc__)
96-
returnfunc
97-
98-
9960
defcopy(source):
10061
"""Copy a docstring from another source function (if present)."""
10162
defdo_copy(target):
@@ -114,14 +75,3 @@ def dedent_interpd(func):
11475
"""Dedent *func*'s docstring, then interpolate it with ``interpd``."""
11576
func.__doc__=inspect.getdoc(func)
11677
returninterpd(func)
117-
118-
119-
@cbook.deprecated("3.1",alternative="docstring.copy() and cbook.dedent()")
120-
defcopy_dedent(source):
121-
"""A decorator that will copy the docstring from the source and
122-
then dedent it"""
123-
# note the following is ugly because "Python is not a functional
124-
# language" - GVR. Perhaps one day, functools.compose will exist.
125-
# or perhaps not.
126-
# http://mail.python.org/pipermail/patches/2007-February/021687.html
127-
returnlambdatarget:dedent(copy(source)(target))

‎lib/matplotlib/scale.py

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -201,81 +201,6 @@ def set_default_locators_and_formatters(self, axis):
201201
axis.set_minor_locator(NullLocator())
202202

203203

204-
@cbook.deprecated("3.1",alternative="LogTransform")
205-
classLogTransformBase(Transform):
206-
input_dims=output_dims=1
207-
208-
def__init__(self,nonpos='clip'):
209-
Transform.__init__(self)
210-
self._clip= {"clip":True,"mask":False}[nonpos]
211-
212-
deftransform_non_affine(self,a):
213-
returnLogTransform.transform_non_affine(self,a)
214-
215-
def__str__(self):
216-
return"{}({!r})".format(
217-
type(self).__name__,"clip"ifself._clipelse"mask")
218-
219-
220-
@cbook.deprecated("3.1",alternative="InvertedLogTransform")
221-
classInvertedLogTransformBase(Transform):
222-
input_dims=output_dims=1
223-
224-
deftransform_non_affine(self,a):
225-
returnma.power(self.base,a)
226-
227-
def__str__(self):
228-
return"{}()".format(type(self).__name__)
229-
230-
231-
@cbook.deprecated("3.1",alternative="LogTransform")
232-
classLog10Transform(LogTransformBase):
233-
base=10.0
234-
235-
definverted(self):
236-
returnInvertedLog10Transform()
237-
238-
239-
@cbook.deprecated("3.1",alternative="InvertedLogTransform")
240-
classInvertedLog10Transform(InvertedLogTransformBase):
241-
base=10.0
242-
243-
definverted(self):
244-
returnLog10Transform()
245-
246-
247-
@cbook.deprecated("3.1",alternative="LogTransform")
248-
classLog2Transform(LogTransformBase):
249-
base=2.0
250-
251-
definverted(self):
252-
returnInvertedLog2Transform()
253-
254-
255-
@cbook.deprecated("3.1",alternative="InvertedLogTransform")
256-
classInvertedLog2Transform(InvertedLogTransformBase):
257-
base=2.0
258-
259-
definverted(self):
260-
returnLog2Transform()
261-
262-
263-
@cbook.deprecated("3.1",alternative="LogTransform")
264-
classNaturalLogTransform(LogTransformBase):
265-
base=np.e
266-
267-
definverted(self):
268-
returnInvertedNaturalLogTransform()
269-
270-
271-
@cbook.deprecated("3.1",alternative="InvertedLogTransform")
272-
classInvertedNaturalLogTransform(InvertedLogTransformBase):
273-
base=np.e
274-
275-
definverted(self):
276-
returnNaturalLogTransform()
277-
278-
279204
classLogTransform(Transform):
280205
input_dims=output_dims=1
281206

@@ -341,15 +266,6 @@ class LogScale(ScaleBase):
341266
"""
342267
name='log'
343268

344-
# compatibility shim
345-
LogTransformBase=LogTransformBase
346-
Log10Transform=Log10Transform
347-
InvertedLog10Transform=InvertedLog10Transform
348-
Log2Transform=Log2Transform
349-
InvertedLog2Transform=InvertedLog2Transform
350-
NaturalLogTransform=NaturalLogTransform
351-
InvertedNaturalLogTransform=InvertedNaturalLogTransform
352-
353269
@cbook.deprecated("3.3",alternative="scale.LogTransform")
354270
@property
355271
defLogTransform(self):

‎lib/matplotlib/tests/test_scale.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
frommatplotlib.cbookimportMatplotlibDeprecationWarning
22
importmatplotlib.pyplotasplt
33
frommatplotlib.scaleimport (
4-
LogTransform,Log10Transform,InvertedLog10Transform,
4+
LogTransform,InvertedLogTransform,
55
SymmetricalLogTransform)
66
frommatplotlib.testing.decoratorsimportcheck_figures_equal,image_comparison
77

@@ -126,8 +126,9 @@ def test_logscale_invert_transform():
126126
tform= (ax.transAxes+ax.transData.inverted()).inverted()
127127

128128
# direct test of log transform inversion
129-
withpytest.warns(MatplotlibDeprecationWarning):
130-
assertisinstance(Log10Transform().inverted(),InvertedLog10Transform)
129+
inverted_transform=LogTransform(base=2).inverted()
130+
assertisinstance(inverted_transform,InvertedLogTransform)
131+
assertinverted_transform.base==2
131132

132133

133134
deftest_logscale_transform_repr():

‎lib/matplotlib/ticker.py

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -467,38 +467,6 @@ def __call__(self, x, pos=None):
467467
s=s.rstrip('0').rstrip('.')
468468
returns
469469

470-
@cbook.deprecated("3.1")
471-
defpprint_val(self,x,d):
472-
"""
473-
Formats the value *x* based on the size of the axis range *d*.
474-
"""
475-
# If the number is not too big and it's an int, format it as an int.
476-
ifabs(x)<1e4andx==int(x):
477-
return'%d'%x
478-
479-
ifd<1e-2:
480-
fmt='%1.3e'
481-
elifd<1e-1:
482-
fmt='%1.3f'
483-
elifd>1e5:
484-
fmt='%1.1e'
485-
elifd>10:
486-
fmt='%1.1f'
487-
elifd>1:
488-
fmt='%1.2f'
489-
else:
490-
fmt='%1.3f'
491-
s=fmt%x
492-
tup=s.split('e')
493-
iflen(tup)==2:
494-
mantissa=tup[0].rstrip('0').rstrip('.')
495-
sign=tup[1][0].replace('+','')
496-
exponent=tup[1][1:].lstrip('0')
497-
s='%se%s%s'% (mantissa,sign,exponent)
498-
else:
499-
s=s.rstrip('0').rstrip('.')
500-
returns
501-
502470

503471
classScalarFormatter(Formatter):
504472
"""
@@ -780,16 +748,6 @@ def _set_format(self):
780748
ifself._usetexorself._useMathText:
781749
self.format=r'$\mathdefault{%s}$'%self.format
782750

783-
@cbook.deprecated("3.1")
784-
defpprint_val(self,x):
785-
xp= (x-self.offset)/ (10.**self.orderOfMagnitude)
786-
ifabs(xp)<1e-8:
787-
xp=0
788-
ifself._useLocale:
789-
returnlocale.format_string(self.format, (xp,))
790-
else:
791-
returnself.format%xp
792-
793751
def_formatSciNotation(self,s):
794752
# transform 1e+004 into 1e4, for example
795753
ifself._useLocale:
@@ -1020,10 +978,6 @@ def format_data_short(self, value):
1020978
# docstring inherited
1021979
return'%-12g'%value
1022980

1023-
@cbook.deprecated("3.1")
1024-
defpprint_val(self,*args,**kwargs):
1025-
returnself._pprint_val(*args,**kwargs)
1026-
1027981
def_pprint_val(self,x,d):
1028982
# If the number is not too big and it's an int, format it as an int.
1029983
ifabs(x)<1e4andx==int(x):
@@ -2214,24 +2168,6 @@ def view_limits(self, dmin, dmax):
22142168
returndmin,dmax
22152169

22162170

2217-
@cbook.deprecated("3.1")
2218-
defdecade_down(x,base=10):
2219-
"""Floor x to the nearest lower decade."""
2220-
ifx==0.0:
2221-
return-base
2222-
lx=np.floor(np.log(x)/np.log(base))
2223-
returnbase**lx
2224-
2225-
2226-
@cbook.deprecated("3.1")
2227-
defdecade_up(x,base=10):
2228-
"""Ceil x to the nearest higher decade."""
2229-
ifx==0.0:
2230-
returnbase
2231-
lx=np.ceil(np.log(x)/np.log(base))
2232-
returnbase**lx
2233-
2234-
22352171
defis_decade(x,base=10,*,rtol=1e-10):
22362172
ifnotnp.isfinite(x):
22372173
returnFalse

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp