8000 Deprecate more of cbook. · matplotlib/matplotlib@d660a81 · GitHub
[go: up one dir, main page]
Skip to content

Commit d660a81

Browse files
anntzeranntzer
committed
Deprecate more of cbook.
restrict_dict can easily be inlined as a comprehension and is more legible that way. get_split_ind is unused other than as a helper for the deprecated cbook.wrap. get_recursive_filelist is unused and can trivially be implemented using os.walk.
1 parent 6a91a4e commit d660a81

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

‎lib/matplotlib/backends/backend_agg.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
from matplotlib import verbose, rcParams, __version__
3232
from matplotlib.backend_bases import (
3333
_Backend, FigureCanvasBase, FigureManagerBase, RendererBase)
34-
from matplotlib.cbook import maxdict, restrict_dict
34+
from matplotlib.cbook import maxdict
3535
from matplotlib.figure import Figure
3636
from matplotlib.font_manager import findfont, get_font
3737
from matplotlib.ft2font import (LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING,
@@ -567,12 +567,10 @@ def print_jpg(self, filename_or_obj, *args, **kwargs):
567567
color = tuple([int(x * 255.0) for x in rgba[:3]])
568568
background = Image.new('RGB', size, color)
569569
background.paste(image, image)
570-
options = restrict_dict(kwargs, ['quality', 'optimize',
571-
'progressive'])
572-
573-
if 'quality' not in options:
574-
options['quality'] = rcParams['savefig.jpeg_quality']
575-
570+
options = {k: kwargs[k]
571+
for k in ['quality', 'optimize', 'progressive']
572+
if k in kwargs}
573+
options.setdefault('quality', rcParams['savefig.jpeg_quality'])
576574
return background.save(filename_or_obj, format='jpeg', **options)
577575
print_jpeg = print_jpg
578576

‎lib/matplotlib/backends/backend_gdk.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from matplotlib.backend_bases import (
2727
_Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
2828
RendererBase)
29-
from matplotlib.cbook import restrict_dict, warn_deprecated
29+
from matplotlib.cbook import warn_deprecated
3030
from matplotlib.figure 8000 import Figure
3131
from matplotlib.mathtext import MathTextParser
3232
from matplotlib.transforms import Affine2D
@@ -428,10 +428,9 @@ def _print_image(self, filename, format, *args, **kwargs):
428428

429429
# set the default quality, if we are writing a JPEG.
430430
# http://www.pygtk.org/docs/pygtk/class-gdkpixbuf.html#method-gdkpixbuf--save
431-
options = restrict_dict(kwargs, ['quality'])
432-
if format in ['jpg','jpeg']:
433-
if 'quality' not in options:
434-
options['quality'] = rcParams['savefig.jpeg_quality']
431+
options = {k: kwargs[k] for k in ['quality'] if k in kwargs}
432+
if format in ['jpg', 'jpeg']:
433+
options.setdefault('quality', rcParams['savefig.jpeg_quality'])
435434
options['quality'] = str(options['quality'])
436435

437436
pixbuf.save(filename, format, options=options)

‎lib/matplotlib/backends/backend_gtk.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -429,11 +429,9 @@ def _print_image(self, filename, format, *args, **kwargs):
429429

430430
# set the default quality, if we are writing a JPEG.
431431
# http://www.pygtk.org/docs/pygtk/class-gdkpixbuf.html#method-gdkpixbuf--save
432-
options = cbook.restrict_dict(kwargs, ['quality'])
433-
if format in ['jpg','jpeg']:
434-
if 'quality' not in options:
435-
options['quality'] = rcParams['savefig.jpeg_quality']
436-
432+
options = {k: kwargs[k] for k in ['quality'] if k in kwargs}
433+
if format in ['jpg', 'jpeg']:
434+
options.setdefault('quality', rcParams['savefig.jpeg_quality'])
437435
options['quality'] = str(options['quality'])
438436

439437
if isinstance(filename, six.string_types):

‎lib/matplotlib/cbook/__init__.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -889,6 +889,7 @@ def __get_item__(self, i):
889889
return self.data[i % len(self.data)]
890890

891891

892+
@deprecated('2.1')
892893
def get_split_ind(seq, N):
893894
"""
894895
*seq* is a list of words. Return the index into seq such that::
@@ -1005,6 +1006,7 @@ def listFiles(root, patterns='*', recurse=1, return_folders=0):
10051006
return results
10061007

10071008

1009+
@deprecated('2.1')
10081010
def get_recursive_filelist(args):
10091011
"""
10101012
Recurse all the files and dirs in *args* ignoring symbolic links
@@ -1236,6 +1238,7 @@ def reverse_dict(d):
12361238
return {v: k for k, v in six.iteritems(d)}
12371239

12381240

1241+
@deprecated('2.1')
12391242
def restrict_dict(d, keys):
12401243
"""
12411244
Return a dictionary that contains those keys that appear in both

0 commit comments

Comments
 (0)
0