summaryrefslogtreecommitdiff
path: root/paste/exceptions/collector.py
diff options
context:
space:
mode:
authorMarc Abramowitz <marc@marc-abramowitz.com>2016-03-07 13:56:40 -0800
committerMarc Abramowitz <marc@marc-abramowitz.com>2016-03-07 13:56:40 -0800
commitac2c2ebe9088237fb5b3f3fd8c24b53d3ea94605 (patch)
treed257ee9f3ec398c41056ff7ce505eff583f5da50 /paste/exceptions/collector.py
parent8a98c4272d8d7dc723b3125dedc690fe5be58a44 (diff)
parent535e6df5251c2cc433e5c76e55b44f1832451d4e (diff)
downloadpaste-ac2c2ebe9088237fb5b3f3fd8c24b53d3ea94605.tar.gz
Merged in nilsph/paste/py3k (pull request #28)
Py3k fixes
Diffstat (limited to 'paste/exceptions/collector.py')
-rw-r--r--paste/exceptions/collector.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/paste/exceptions/collector.py b/paste/exceptions/collector.py
index 8867bf7..632ce06 100644
--- a/paste/exceptions/collector.py
+++ b/paste/exceptions/collector.py
@@ -266,7 +266,7 @@ class ExceptionCollector(object):
name = co.co_name
globals = f.f_globals
locals = f.f_locals
- if not hasattr(locals, 'has_key'):
+ if not hasattr(locals, 'keys'):
# Something weird about this frame; it's not a real dict
warnings.warn(
"Frame %s has an invalid locals(): %r" % (