Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/387279 )
Change subject: Fix a ton of errors that were making flake8 freak out
......................................................................
Fix a ton of errors that were making flake8 freak out
Change-Id: Iad20719e89cc2545c9c9e0046cc1ff3fc901777e
---
M conftool/cli/syncer.py
M conftool/cli/tool.py
M conftool/drivers/etcd.py
M conftool/kvobject.py
4 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/conftool
refs/changes/79/387279/1
diff --git a/conftool/cli/syncer.py b/conftool/cli/syncer.py
index cdba426..2d33c35 100644
--- a/conftool/cli/syncer.py
+++ b/conftool/cli/syncer.py
@@ -111,7 +111,7 @@
_log.info("Parsing file %s", filename)
try:
filedata = yaml.load(fh)
- except:
+ except yaml.YAMLError:
_log.critical("Malformed data in file %s",
filename)
filedata = {}
diff --git a/conftool/cli/tool.py b/conftool/cli/tool.py
index eab257a..2bc72a5 100644
--- a/conftool/cli/tool.py
+++ b/conftool/cli/tool.py
@@ -86,7 +86,7 @@
regex = self._namedef.replace('re:', '', 1)
try:
r = re.compile(regex)
- except:
+ except re.error:
_log.critical("Invalid regexp: %s", regex)
sys.exit(1)
objlist = [k for (k, v) in KVObject.backend.driver.ls(cur_dir)]
diff --git a/conftool/drivers/etcd.py b/conftool/drivers/etcd.py
index 54d85bb..c0934eb 100644
--- a/conftool/drivers/etcd.py
+++ b/conftool/drivers/etcd.py
@@ -36,7 +36,7 @@
with open(filename, 'r') as f:
c = yaml.load(f)
conf.update(c)
- except:
+ except (IOError, yaml.YAMLError):
continue
return conf
@@ -175,9 +175,9 @@
def watch_lock(self, path):
name = path.replace('/', '-')
- l = etcd.Lock(self.client, name)
+ lock = etcd.Lock(self.client, name)
try:
- r = self.client.read(l.path)
+ r = self.client.read(lock.path)
return bool(r._children)
except etcd.EtcdKeyNotFoundErrror:
return False
diff --git a/conftool/kvobject.py b/conftool/kvobject.py
index 8f6f368..2dcdc38 100644
--- a/conftool/kvobject.py
+++ b/conftool/kvobject.py
@@ -165,8 +165,8 @@
@contextmanager
def lock(cls, path):
try:
- l = cls.backend.driver.get_lock(path)
- yield l
+ backend_lock = cls.backend.driver.get_lock(path)
+ yield backend_lock
cls.backend.driver.release_lock(path)
except Exception as e:
_log.critical("Problems inside lock for %s: %s", path, e)
--
To view, visit https://gerrit.wikimedia.org/r/387279
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad20719e89cc2545c9c9e0046cc1ff3fc901777e
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/conftool
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
