Fixes following PR review.

anntzer · anntzer · commit 8be4eaedee52 · 2018-06-25T13:40:32.000+02:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -387,7 +387,19 @@ def ge(self, level):
 
 
 def _logged_cached(fmt, func=None):
-    if func is None:
+    """
+    Decorator that logs a function's return value, and memoizes that value.
+
+    After ::
+
+        @_logged_cached(fmt)
+        def func(): ...
+
+    the first call to *func* will log its return value at the DEBUG level using
+    %-format string *fmt*, and memoize it; later calls to *func* will directly
+    return that value.
+    """
+    if func is None:  # Return the actual decorator.
         return functools.partial(_logged_cached, fmt)
 
     called = False
@@ -569,7 +581,7 @@ def _get_xdg_config_dir():
     <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
     """
     return (os.environ.get('XDG_CONFIG_HOME')
-            or (Path(get_home(), ".config")
+            or (str(Path(get_home(), ".config"))
                 if get_home()
                 else None))
 
@@ -581,21 +593,21 @@ def _get_xdg_cache_dir():
     <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
     """
     return (os.environ.get('XDG_CACHE_HOME')
-            or (Path(get_home(), ".cache")
+            or (str(Path(get_home(), ".cache"))
                 if get_home()
                 else None))
 
 
 def _get_config_or_cache_dir(xdg_base):
     configdir = os.environ.get('MPLCONFIGDIR')
-    configdir = (
-        Path(configdir).resolve()
-        if configdir
-        else Path(xdg_base, "matplotlib")
-        if sys.platform.startswith(('linux', 'freebsd')) and xdg_base
-        else Path(get_home(), ".matplotlib")
-        if get_home()
-        else None)
+    if configdir:
+        configdir = Path(configdir).resolve()
+    elif sys.platform.startswith(('linux', 'freebsd')) and xdg_base:
+        configdir = Path(xdg_base, "matplotlib")
+    elif get_home():
+        configdir = Path(get_home(), ".matplotlib")
+    else:
+        configdir = None
 
     if configdir:
         try:
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -1984,7 +1984,7 @@ class so far, an alias named ``get_alias`` will be defined; the same will
     can be used by `~.normalize_kwargs` (which assumes that higher priority
     aliases come last).
     """
-    if cls is None:
+    if cls is None:  # Return the actual class decorator.
         return functools.partial(_define_aliases, alias_d)
 
     def make_alias(name):  # Enforce a closure over *name*.
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -19,7 +19,6 @@
 import matplotlib
 from matplotlib.testing.exceptions import ImageComparisonFailure
 from matplotlib import _png, cbook
-from matplotlib import cbook
 
 __all__ = ['compare_float', 'compare_images', 'comparable_formats']
 
