cleanup

src/allmydata/scripts/tahoe_run.py

@@ -62,13 +62,9 @@ def get_pid_from_pidfile(pidfile):
               inaccessible, ``-1`` if PID file invalid.
     """
     try:
-        with open(pidfile, "r") as f:
-            data = f.read().strip()
+        pid, _ = parse_pidfile(pidfile)
     except EnvironmentError:
         return None
-
-    try:
-        pid, _ = parse_pidfile(pidfile)
     except InvalidPidFile:
         return -1
 

src/allmydata/util/pid.py

@@ -1,4 +1,3 @@
-import os
 import psutil
 
 # the docs are a little misleading, but this is either WindowsFileLock