Merge pull request matplotlib#10534 from anntzer/getrealpathandstat

efiring · web-flow · commit 180639b3df57 · 2018-02-19T12:54:54.000-10:00
Modernize cbook.get_realpath_and_stat.
diff --git a/doc/api/next_api_changes/2018-02-15-AL-deprecations.rst b/doc/api/next_api_changes/2018-02-15-AL-deprecations.rst
@@ -1,5 +1,8 @@
 Deprecations
 ````````````
-The following functions are deprecated:
-- ``cbook.is_numlike`` (use ``isinstance(..., numbers.Number)`` instead)
-- ``mathtext.unichr_safe`` (use ``chr`` instead)
+The following functions and classes are deprecated:
+
+- ``cbook.GetRealpathAndStat`` (which is only a helper for
+  ``get_realpath_and_stat``),
+- ``cbook.is_numlike`` (use ``isinstance(..., numbers.Number)`` instead),
+- ``mathtext.unichr_safe`` (use ``chr`` instead),
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -864,6 +864,7 @@ def mkdirs(newdir, mode=0o777):
                 raise
 
 
+@deprecated('3.0')
 class GetRealpathAndStat(object):
     def __init__(self):
         self._cache = {}
@@ -882,7 +883,12 @@ def __call__(self, path):
         return result
 
 
-get_realpath_and_stat = GetRealpathAndStat()
+@functools.lru_cache()
+def get_realpath_and_stat(path):
+    realpath = os.path.realpath(path)
+    stat = os.stat(realpath)
+    stat_key = (stat.st_ino, stat.st_dev)
+    return realpath, stat_key
 
 
 @deprecated('2.1')
