1.1 --- a/lib/builtins.py Sun May 08 18:41:21 2011 +0200
1.2 +++ b/lib/builtins.py Sun May 08 18:56:14 2011 +0200
1.3 @@ -449,7 +449,8 @@
1.4 def execfile(filename, globals=None, locals=None): pass
1.5 def filter(function, sequence): pass
1.6
1.7 -def getattr(obj, name, default=object()): # object() is a placeholder
1.8 +_getattr_default=object() # a placeholder for a missing value
1.9 +def getattr(obj, name, default=_getattr_default):
1.10
1.11 "Implementation of getattr."
1.12
1.13 @@ -458,7 +459,7 @@
1.14 try:
1.15 return _getattr(obj, name)
1.16 except AttributeError:
1.17 - if default is not NotImplemented:
1.18 + if default is not _getattr_default:
1.19 return default
1.20 else:
1.21 raise