Ejegg has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343965 )
Change subject: Fixes suggested by thcipriani
......................................................................
Fixes suggested by thcipriani
Change-Id: I03592650c63907ffa4e14a1a136372bff3038f79
---
M processcontrol/lock.py
1 file changed, 9 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/processcontrol/lock.py b/processcontrol/lock.py
index 6c91863..6af0bb5 100644
--- a/processcontrol/lock.py
+++ b/processcontrol/lock.py
@@ -5,7 +5,6 @@
'''
from __future__ import print_function
import os
-import os.path
import sys
lockfile = None
@@ -17,13 +16,13 @@
if os.path.exists(filename):
print("Lockfile found!", file=sys.stderr)
- f = open(filename, "r")
- pid = None
- try:
- pid = int(f.read())
- except ValueError:
- pass
- f.close()
+ with open(filename, "r") as f:
+ pid = None
+ try:
+ pid = int(f.read())
+ except ValueError:
+ pass
+
if not pid:
print("Invalid lockfile contents.", file=sys.stderr)
else:
@@ -37,9 +36,8 @@
print("Removing old lockfile.", file=sys.stderr)
os.unlink(filename)
- f = open(filename, "w")
- f.write(str(os.getpid()))
- f.close()
+ with open(filename, "w") as f:
+ f.write(str(os.getpid()))
global lockfile
lockfile = filename
--
To view, visit https://gerrit.wikimedia.org/r/343965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I03592650c63907ffa4e14a1a136372bff3038f79
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
