[Python-checkins] cpython (merge 3.3 -> default): #14853: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/1d0ff57e392e
changeset:   84815:1d0ff57e392e
parent:      84812:52f0aa0d552a
parent:      84814:c5d847ee354a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Jul 25 05:24:47 2013 +0200
summary:
  #14853: merge with 3.3.

files:
  Lib/test/test_file.py |  10 ----------
  1 files changed, 0 insertions(+), 10 deletions(-)


diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -148,16 +148,6 @@
                 f.close()
                 self.fail('%r is an invalid file mode' % mode)
 
-    def testStdin(self):
-        # This causes the interpreter to exit on OSF1 v5.1.
-        if sys.platform != 'osf1V5':
-            self.assertRaises((OSError, ValueError), sys.stdin.seek, -1)
-        else:
-            print((
-                '  Skipping sys.stdin.seek(-1), it may crash the interpreter.'
-                ' Test manually.'), file=sys.__stdout__)
-        self.assertRaises((OSError, ValueError), sys.stdin.truncate)
-
     def testBadModeArgument(self):
         # verify that we get a sensible error message for bad mode argument
         bad_mode = "qwerty"

-- 
Repository URL: http://hg.python.org/cpython