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 ff4996ae482785eb23b34e81ddaf7455302b7ba6..7a68b2f7203a1f7fd46983e44e70d2bb199df8e8 100644 (file)
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -123,6 +123,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 98dae61c604fe0009ee1395d5ab2f2cd7643e734..e247506af5728ed07e09a804c85a8c7c35358277 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.1 alpha 0
 Core and Builtins
 -----------------
 
+- Added test case to ensure attempts to read from a file opened for writing
+  fail.
+
 - Issue #3106: Speedup some comparisons (str/str and int/int).
 
 - Issue #2183: Simplify and optimize bytecode for list, dict and set