--- a/Lib/test/test_raise.py	Thu Jan 26 08:47:27 2012 -0600
+++ b/Lib/test/test_raise.py	Thu Feb 02 13:58:45 2012 -0800
@@ -77,6 +77,16 @@
                 nested_reraise()
         self.assertRaises(TypeError, reraise)
 
+    def test_raise_from_None(self):
+        try:
+            try:
+                raise TypeError("foo")
+            except:
+                raise ValueError() from None
+        except ValueError as e:
+            self.assertTrue(isinstance(e.__context__, TypeError))
+            self.assertIsNone(e.__cause__)
+
     def test_with_reraise1(self):
         def reraise():
             try: