[pypy-svn] r42201 - in pypy/dist/pypy/module/_file: . test

[afa at codespeak.net]

Author: afa
Date: Fri Apr 20 13:26:21 2007
New Revision: 42201

Modified:
   pypy/dist/pypy/module/_file/app_file.py
   pypy/dist/pypy/module/_file/test/test_file_extra.py
Log:
file.__repr__ must use %s for the filename, not %r.
This makes a difference when os.path.sep == '\\'.

Now all tests for the _file module pass on Windows.


Modified: pypy/dist/pypy/module/_file/app_file.py
==============================================================================
--- pypy/dist/pypy/module/_file/app_file.py	(original)
+++ pypy/dist/pypy/module/_file/app_file.py	Fri Apr 20 13:26:21 2007
@@ -271,7 +271,7 @@
         return os.isatty(self.fd)
 
     def __repr__(self):
-        return '<%s file %r, mode %r at 0x%x>' % (
+        return "<%s file '%s', mode %r at 0x%x>" % (
             self._closed and 'closed' or 'open',
             self._name,
             self._mode,

Modified: pypy/dist/pypy/module/_file/test/test_file_extra.py
==============================================================================
--- pypy/dist/pypy/module/_file/test/test_file_extra.py	(original)
+++ pypy/dist/pypy/module/_file/test/test_file_extra.py	Fri Apr 20 13:26:21 2007
@@ -66,7 +66,7 @@
     def test_repr(self):
         r = repr(self.file)
         assert r.find('open file') >= 0
-        assert r.find(repr(self.file.name)) >= 0
+        assert r.find(self.file.name) >= 0
         assert r.find(self.file.mode) >= 0
 
     def test_isatty(self):