Merge pull request #34 from rbscholtus/windows/pidfile-locations

Use APPDATA and HOME locations on Windows
trbs · Jul 18, 2020 · 56be516 · 56be516
2 parents 64aa87c + 0356a1d
commit 56be516
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+3.0.4
+-----
+
+ - Use APPDATA and HOME locations on Windows
+
+
 3.0.3
 -----
 

diff --git a/pid/__init__.py b/pid/__init__.py
@@ -17,8 +17,7 @@
 else:
     from .posix import PidFile  # NOQA
 
-
-__version__ = "3.0.3"
+__version__ = "3.0.4"
 __all__ = [
     '__version__',
     'DEFAULT_PID_DIR',

diff --git a/pid/utils.py b/pid/utils.py
@@ -15,16 +15,19 @@ def effective_access(*args, **kwargs):
 
 def determine_pid_directory():
     if sys.platform == "win32":
-        return tempfile.gettempdir()
-
-    uid = os.geteuid() if hasattr(os, "geteuid") else os.getuid()
-
-    paths = [
-        "/run/user/%s/" % uid,
-        "/var/run/user/%s/" % uid,
-        "/run/",
-        "/var/run/",
-    ]
+        if 'APPDATA' in os.environ:
+            paths = [os.environ['APPDATA']]
+        else:
+            paths = [os.path.expanduser('~\\AppData\\Roaming')]
+    else:
+        uid = os.geteuid() if hasattr(os, "geteuid") else os.getuid()  # pylint: disable=no-member
+
+        paths = [
+            "/run/user/%s/" % uid,
+            "/var/run/user/%s/" % uid,
+            "/run/",
+            "/var/run/",
+        ]
 
     for path in paths:
         if effective_access(os.path.realpath(path), os.W_OK | os.X_OK):