Skip to content

Commit 76ec922

Browse files
committed
Fix implementations of backcompat wrappers.
1 parent c0a145d commit 76ec922

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

lib/matplotlib/__init__.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,8 @@ def get_executable_info(name):
445445
-------
446446
If the executable is found, a namedtuple with fields ``executable`` (`str`)
447447
and ``version`` (`distutils.version.LooseVersion`, or ``None`` if the
448-
version cannot be determined); ``None`` if the executable is not found.
448+
version cannot be determined); ``None`` if the executable is not found or
449+
older that the oldest version supported by Matplotlib.
449450
"""
450451

451452
def impl(args, regex, min_ver=None):
@@ -519,27 +520,32 @@ def get_all_executable_infos():
519520

520521
@cbook.deprecated("3.0")
521522
def checkdep_dvipng():
522-
return str(get_executable_info("dvipng").version)
523+
info = get_executable_info("dvipng")
524+
return str(info.version) if info else None
523525

524526

525527
@cbook.deprecated("3.0")
526528
def checkdep_ghostscript():
527529
info = get_executable_info("gs")
528-
checkdep_ghostscript.executable = info.executable
529-
checkdep_ghostscript.version = str(info.version)
530+
if info:
531+
checkdep_ghostscript.executable = info.executable
532+
checkdep_ghostscript.version = str(info.version)
530533
return checkdep_ghostscript.executable, checkdep_ghostscript.version
531534
checkdep_ghostscript.executable = None
532535
checkdep_ghostscript.version = None
533536

534537

535538
@cbook.deprecated("3.0")
536539
def checkdep_pdftops():
537-
return str(get_executable_info("pdftops").version)
540+
info = get_executable_info("pdftops")
541+
return str(info.version) if info else None
538542

539543

540544
@cbook.deprecated("3.0")
541545
def checkdep_inkscape():
542-
checkdep_inkscape.version = str(get_executable_info("inkscape").version)
546+
info = get_executable_info("inkscape")
547+
if info:
548+
checkdep_inkscape.version = str(info.version)
543549
return checkdep_inkscape.version
544550
checkdep_inkscape.version = None
545551

0 commit comments

Comments
 (0)