Reword the timeout error message in cbook._lock_path.

anntzer · anntzer · commit bfede46915a7 · 2018-05-12T21:39:31.000-07:00
1) Lock files are specific files now, not globs of directories.
2) Format the path with `{}`, not `{!r}` as _lock_path is passing a Path
   object but we don't want the error message to say "PosixPath('foo')",
   just "foo".

The previously used `_lockstr` will go away at the same time the
deprecated `Locked` is removed.
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -1925,7 +1925,12 @@ def _lock_path(path):
         except FileExistsError:
             time.sleep(sleeptime)
     else:
-        raise TimeoutError(_lockstr.format(lock_path))
+        raise TimeoutError("""\
+Lock error: Matplotlib failed to acquire the following lock file:
+    {}
+This maybe due to another process holding this lock file.  If you are sure no
+other Matplotlib process is running, remove this file and try again.""".format(
+            lock_path))
     try:
         yield
     finally:
