From 0f7a9e2da2f0a6d35c9558ff4ecb2a2fe0fbd8e0 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 29 Aug 2009 09:37:56 -0500
Subject: [PATCH] fix the rest of py/code tests on python 3

--HG--
branch : trunk
---
 py/code/assertion.py            |  3 +++
 py/code/testing/test_excinfo.py | 14 +++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/py/code/assertion.py b/py/code/assertion.py
index 994a07608..b5d2314c8 100644
--- a/py/code/assertion.py
+++ b/py/code/assertion.py
@@ -74,3 +74,6 @@ class AssertionError(BuiltinAssertionError):
                     self.args = (self.msg,)
             else:
                 self.msg = None
+
+if sys.version_info > (3, 0):
+    AssertionError.__module__ = "builtins"
diff --git a/py/code/testing/test_excinfo.py b/py/code/testing/test_excinfo.py
index fc026024c..8348bb8f3 100644
--- a/py/code/testing/test_excinfo.py
+++ b/py/code/testing/test_excinfo.py
@@ -295,11 +295,15 @@ class TestFormattedExcinfo:
     def test_repr_source_excinfo(self):
         """ check if indentation is right """
         pr = FormattedExcinfo()
-        excinfo = self.excinfo_from_exec("""
-            def f():
-                assert 0
-            f()
-        """)
+        py.code.patch_builtins()
+        try:
+            excinfo = self.excinfo_from_exec("""
+                def f():
+                    assert 0
+                f()
+            """)
+        finally:
+            py.code.unpatch_builtins()
         pr = FormattedExcinfo()
         source = pr._getentrysource(excinfo.traceback[-1])
         lines = pr.get_source(source, 1, excinfo)