commit 1ca73ede26e05b656787122fea3ce9bd01a5f7f7
author Benjamin Peterson <benjamin@python.org> Sat Feb 27 17:56:22 2010 +0000
committer Benjamin Peterson <benjamin@python.org> Sat Feb 27 17:56:22 2010 +0000
tree c11a10410920180770bdf012794f9bf9d81b4725
parent b7f27ff9ac4f594c7ec3fe2cca44725cb36ffb2d

Merged revisions 78505-78506 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78505 | benjamin.peterson | 2010-02-27 11:40:01 -0600 (Sat, 27 Feb 2010) | 1 line

  only accept AttributeError as indicating no __prepare__ attribute on a metaclass, allowing lookup errors to propogate
........
  r78506 | benjamin.peterson | 2010-02-27 11:41:13 -0600 (Sat, 27 Feb 2010) | 1 line

  check PyDict_New() for error
........

Misc/NEWS

diff --git a/Misc/NEWS b/Misc/NEWS
index c42cef5..d53bcb4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@
 Core and Builtins
 -----------------
 
+- Handle errors from looking up __prepare__ correctly.
+
 - Issue #5939: Add additional runtime checking to ensure a valid capsule
   in Modules/_ctypes/callproc.c.