Skip to content

Commit 5f4eead

Browse files
committed
MNT: minor simplification
1 parent b6278e3 commit 5f4eead

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

lib/matplotlib/font_manager.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -820,8 +820,7 @@ def set_family(self, family):
820820
"""
821821
if family is None:
822822
family = rcParams['font.family']
823-
family = _normalize_font_family(family)
824-
self._family = family
823+
self._family = _normalize_font_family(family)
825824
set_name = set_family
826825

827826
def set_style(self, style):
@@ -948,6 +947,7 @@ def ttfdict_to_fnames(d):
948947
fnames.append(fname)
949948
return fnames
950949

950+
951951
def pickle_dump(data, filename):
952952
"""
953953
Equivalent to pickle.dump(data, open(filename, 'w'))
@@ -956,6 +956,7 @@ def pickle_dump(data, filename):
956956
with open(filename, 'wb') as fh:
957957
pickle.dump(data, fh)
958958

959+
959960
def pickle_load(filename):
960961
"""
961962
Equivalent to pickle.load(open(filename, 'r'))
@@ -969,7 +970,7 @@ def pickle_load(filename):
969970
def _normalize_font_family(family):
970971
if is_string_like(family):
971972
family = [six.text_type(family)]
972-
elif (not is_string_like(family) and isinstance(family, Iterable)):
973+
elif isinstance(family, Iterable):
973974
family = [six.text_type(f) for f in family]
974975
return family
975976

0 commit comments

Comments
 (0)