# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1304873774 -7200
# Node ID ea8cd6ca4083296d045da974ce8521b2420b5de1
# Parent  57ac9550cc0b06a2d017345f89dd9da7ac2dfa4a
Fixed the placeholder default for getattr which was a hybrid of the old and new
mechanisms for defining such a placeholder.

diff -r 57ac9550cc0b -r ea8cd6ca4083 lib/builtins.py
--- a/lib/builtins.py	Sun May 08 18:41:21 2011 +0200
+++ b/lib/builtins.py	Sun May 08 18:56:14 2011 +0200
@@ -449,7 +449,8 @@
 def execfile(filename, globals=None, locals=None): pass
 def filter(function, sequence): pass
 
-def getattr(obj, name, default=object()): # object() is a placeholder
+_getattr_default=object() # a placeholder for a missing value
+def getattr(obj, name, default=_getattr_default):
 
     "Implementation of getattr."
 
@@ -458,7 +459,7 @@
     try:
         return _getattr(obj, name)
     except AttributeError:
-        if default is not NotImplemented:
+        if default is not _getattr_default:
             return default
         else:
             raise