Merge pull request #14010 from anntzer/home

WeatherGod · web-flow · commit 6fb906ee8fdb · 2019-04-23T10:23:57.000-04:00
Deprecate get_home()
diff --git a/doc/api/next_api_changes/2019-04-22-AL.rst b/doc/api/next_api_changes/2019-04-22-AL.rst
@@ -0,0 +1,5 @@
+Deprecations
+````````````
+
+``matplotlib.get_home`` is deprecated (use e.g. ``os.path.expanduser("~")``)
+instead.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -497,6 +497,7 @@ def checkdep_usetex(s):
     return True
 
 
+@cbook.deprecated("3.2", alternative="os.path.expanduser('~')")
 @_logged_cached('$HOME=%s')
 def get_home():
     """
@@ -526,10 +527,7 @@ def _get_xdg_config_dir():
     base directory spec
     <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
     """
-    return (os.environ.get('XDG_CONFIG_HOME')
-            or (str(Path(get_home(), ".config"))
-                if get_home()
-                else None))
+    return os.environ.get('XDG_CONFIG_HOME') or str(Path.home() / ".config")
 
 
 def _get_xdg_cache_dir():
@@ -538,10 +536,7 @@ def _get_xdg_cache_dir():
     base directory spec
     <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
     """
-    return (os.environ.get('XDG_CACHE_HOME')
-            or (str(Path(get_home(), ".cache"))
-                if get_home()
-                else None))
+    return os.environ.get('XDG_CACHE_HOME') or str(Path.home() / ".cache")
 
 
 def _get_config_or_cache_dir(xdg_base):
@@ -550,20 +545,15 @@ def _get_config_or_cache_dir(xdg_base):
         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:
-            configdir.mkdir(parents=True, exist_ok=True)
-        except OSError:
-            pass
-        else:
-            if os.access(str(configdir), os.W_OK) and configdir.is_dir():
-                return str(configdir)
-
+        configdir = Path.home() / ".matplotlib"
+    try:
+        configdir.mkdir(parents=True, exist_ok=True)
+    except OSError:
+        pass
+    else:
+        if os.access(str(configdir), os.W_OK) and configdir.is_dir():
+            return str(configdir)
     return _create_tmp_config_or_cache_dir()
 
 
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -94,15 +94,13 @@
 #  OS Font paths
 MSFolders = \
     r'Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders'
-
 MSFontDirectories = [
     r'SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts',
     r'SOFTWARE\Microsoft\Windows\CurrentVersion\Fonts']
-
 MSUserFontDirectories = [
-    os.path.join(str(Path.home()), r'AppData\Local\Microsoft\Windows\Fonts'),
-    os.path.join(str(Path.home()), r'AppData\Roaming\Microsoft\Windows\Fonts')]
-
+    str(Path.home() / 'AppData/Local/Microsoft/Windows/Fonts'),
+    str(Path.home() / 'AppData/Roaming/Microsoft/Windows/Fonts'),
+]
 X11FontDirectories = [
     # an old standard installation point
     "/usr/X11R6/lib/X11/fonts/TTF/",
@@ -118,7 +116,6 @@
                             Path.home() / ".local/share")) / "fonts"),
     str(Path.home() / ".fonts"),
 ]
-
 OSXFontDirectories = [
     "/Library/Fonts/",
     "/Network/Library/Fonts/",
