From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 15 Feb 2013 17:19:18 +0000 (+0200)
Subject: #17163: merge with 3.3.
X-Git-Tag: v3.4.0a1~1376
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=990f69e6038f9e8b306708a41ec841b930042973;p=thirdparty%2FPython%2Fcpython.git

#17163: merge with 3.3.
---

990f69e6038f9e8b306708a41ec841b930042973
diff --cc Lib/test/test_file.py
index d5eca2bb77f1,a78ddf3d3cab..1daffe4712bc
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@@ -126,12 -126,12 +126,12 @@@ class AutoFileTests
              self.assertEqual(self.f.__exit__(*sys.exc_info()), None)
  
      def testReadWhenWriting(self):
 -        self.assertRaises(IOError, self.f.read)
 +        self.assertRaises(OSError, self.f.read)
  
- class CAutoFileTests(AutoFileTests):
+ class CAutoFileTests(AutoFileTests, unittest.TestCase):
      open = io.open
  
- class PyAutoFileTests(AutoFileTests):
+ class PyAutoFileTests(AutoFileTests, unittest.TestCase):
      open = staticmethod(pyio.open)
  
  
diff --cc Misc/NEWS
index 909375a82e78,616ce65822ad..f4ac978f0a1b
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -839,8 -605,9 +839,11 @@@ Test
  
  - Issue #15539: Added regression tests for Tools/scripts/pindent.py.
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #17163: test_file now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #16925: test_configparser now works with unittest test discovery.
    Patch by Zachary Ware.