From: Skip Montanaro <skip@pobox.com>
Date: Tue, 23 Dec 2008 03:35:04 +0000 (+0000)
Subject: Merged revisions 67908 via svnmerge from
X-Git-Tag: v2.6.2c1~317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a00c74211c555b48faf17f5da9baca4ba2eb468;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 67908 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67908 | skip.montanaro | 2008-12-22 21:30:15 -0600 (Mon, 22 Dec 2008) | 4 lines

  As a result of a regression that snuck into 2.5.3 add a test case that
  ensures that when you try to read from a file opened for writing an IOError
  is raised.
........
---

diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index 2d791a55c07f..96f6da202355 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -120,6 +120,8 @@ class AutoFileTests(unittest.TestCase):
         except:
             self.assertEquals(self.f.__exit__(*sys.exc_info()), None)
 
+    def testReadWhenWriting(self):
+        self.assertRaises(IOError, self.f.read)
 
 class OtherFileTests(unittest.TestCase):
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 4eba4f6d2a2f..a305843c4487 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.6.2
 Core and Builtins
 -----------------
 
+- Added test case to ensure attempts to read from a file opened for writing
+  fail.
+
 - Issue #4597: Fixed several opcodes that weren't always propagating
   exceptions.