[pypy-svn] pypy default: Pypy's implementation of file() is similar to the io module and allows mixing next() and readline().

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r41823:957f4c379c91
Date: 2011-02-11 11:08 +0100
http://bitbucket.org/pypy/pypy/changeset/957f4c379c91/

Log:	Pypy's implementation of file() is similar to the io module and
	allows mixing next() and readline(). Consistency of the results is
	checked in subsequent tests.

diff --git a/lib-python/modified-2.7.0/test/test_file2k.py b/lib-python/modified-2.7.0/test/test_file2k.py
--- a/lib-python/modified-2.7.0/test/test_file2k.py
+++ b/lib-python/modified-2.7.0/test/test_file2k.py
@@ -337,8 +337,9 @@
                 except ValueError:
                     pass
                 else:
-                    self.fail("%s%r after next() didn't raise ValueError" %
-                                     (methodname, args))
+                    if test_support.check_impl_detail():
+                        self.fail("%s%r after next() didn't raise ValueError" %
+                                  (methodname, args))
                 f.close()
 
             # Test to see if harmless (by accident) mixing of read* and