summaryrefslogtreecommitdiffstats
path: root/Demo
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-01-15 16:53:58 (GMT)
committerGuido van Rossum <guido@python.org>2001-01-15 16:53:58 (GMT)
commite13be40b889619af8c26d7d19e924e7babcbb683 (patch)
tree9e9d9e70dbb1e6fb78336779a8efb8fb033b4492 /Demo
parent97d3b93c2fb3ded0c7ac19029e09759915f7c1d5 (diff)
downloadcpython-e13be40b889619af8c26d7d19e924e7babcbb683.zip
cpython-e13be40b889619af8c26d7d19e924e7babcbb683.tar.gz
cpython-e13be40b889619af8c26d7d19e924e7babcbb683.tar.bz2
Geoffrey Gerrietts discovered that a KeyError was caught that probably
should have been a NameError. I'm checking in a change that catches both, just to be sure -- I can't be bothered trying to understand this code any more. :-)
Diffstat (limited to 'Demo')
-rw-r--r--Demo/metaclasses/Meta.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Demo/metaclasses/Meta.py b/Demo/metaclasses/Meta.py
index 771205c..39cbef6 100644
--- a/Demo/metaclasses/Meta.py
+++ b/Demo/metaclasses/Meta.py
@@ -30,7 +30,7 @@ class MetaHelper:
except AttributeError:
try:
ga = self.__formalclass__.__getattr__('__usergetattr__')
- except KeyError:
+ except (KeyError, AttributeError):
raise AttributeError, name
return ga(self, name)
if type(raw) != types.FunctionType: