summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-10-29 20:45:25 -0500
committerMichael Merickel <michael@merickel.org>2017-10-29 20:45:25 -0500
commit87b7b7d7faf745754c128e7c63568729483b86c1 (patch)
tree0bfa4df2581cb5c1da65d9f8bbed3e4917a3f652
parenta5d3d2924dc5e43afe44fa71da1a71627ff3d10c (diff)
downloadpyramid-87b7b7d7faf745754c128e7c63568729483b86c1.tar.gz
pyramid-87b7b7d7faf745754c128e7c63568729483b86c1.tar.bz2
pyramid-87b7b7d7faf745754c128e7c63568729483b86c1.zip
fix lint
-rw-r--r--pyramid/config/settings.py2
-rw-r--r--pyramid/path.py2
-rw-r--r--pyramid/util.py2
-rw-r--r--pyramid/view.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/pyramid/config/settings.py b/pyramid/config/settings.py
index 52b30db81..11a1f7d8c 100644
--- a/pyramid/config/settings.py
+++ b/pyramid/config/settings.py
@@ -74,7 +74,7 @@ def Settings(d=None, _environ_=os.environ, **kw):
value = eget(env_key, value)
value = type_(value)
d.update({k: value for k in keys})
- def O(settings_key, override_key):
+ def O(settings_key, override_key): # noqa: E743
for key in expand_key(settings_key):
d[key] = d[key] or d[override_key]
diff --git a/pyramid/path.py b/pyramid/path.py
index ceb0a0cf3..3fac7e940 100644
--- a/pyramid/path.py
+++ b/pyramid/path.py
@@ -73,7 +73,7 @@ def package_path(package):
# will be the same: a directory name to the package itself
try:
package.__abspath__ = prefix
- except:
+ except Exception:
# this is only an optimization, ignore any error
pass
return prefix
diff --git a/pyramid/util.py b/pyramid/util.py
index d12cd8b8b..09a3e530f 100644
--- a/pyramid/util.py
+++ b/pyramid/util.py
@@ -584,7 +584,7 @@ def action_method(wrapped):
if last_frame.function == 'extract_stack': # pragma: no cover
f.pop()
info = ActionInfo(*f[-backframes])
- except: # pragma: no cover
+ except Exception: # pragma: no cover
info = ActionInfo(None, 0, '', '')
self._ainfo.append(info)
try:
diff --git a/pyramid/view.py b/pyramid/view.py
index 46aec45f1..d1a12df32 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -743,7 +743,7 @@ class ViewMethodsMixin(object):
secure=secure,
request_iface=request_iface.combined,
)
- except:
+ except Exception:
if reraise:
reraise_(*exc_info)
raise