1 files changed, 10 insertions, 0 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 696e99c..32940eb 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -429,6 +429,16 @@ def ints():
     # The following crashes in Python 2.2
     vereq((1).__nonzero__(), 1)
     vereq((0).__nonzero__(), 0)
+    # This returns 'NotImplemented' in Python 2.2
+    class C(int):
+        def __add__(self, other):
+            return NotImplemented
+    try:
+        C() + ""
+    except TypeError:
+        pass
+    else:
+        raise TestFailed, "NotImplemented should have caused TypeErrpr"
 
 def longs():
     if verbose: print "Testing long operations..."