[pypy-svn] r69157 - in pypy/branch/py11/pypy: . module/__builtin__/test module/_file/test module/bz2/test

[hpk at codespeak.net]

Author: hpk
Date: Wed Nov 11 13:33:41 2009
New Revision: 69157

Modified:
   pypy/branch/py11/pypy/conftest.py
   pypy/branch/py11/pypy/module/__builtin__/test/test_import.py
   pypy/branch/py11/pypy/module/_file/test/test_file_extra.py
   pypy/branch/py11/pypy/module/bz2/test/test_bz2_file.py
Log:
fixing usages of path.write() to specify 'wb' for binary writes
setting collect_ignore variable for lib/py 



Modified: pypy/branch/py11/pypy/conftest.py
==============================================================================
--- pypy/branch/py11/pypy/conftest.py	(original)
+++ pypy/branch/py11/pypy/conftest.py	Wed Nov 11 13:33:41 2009
@@ -16,11 +16,7 @@
 rsyncdirs = ['.', '../lib-python', '../demo']
 rsyncignore = ['_cache']
 
-# XXX workaround for a py.test bug clashing with lib/py symlink
-# do we really need the latter?
-empty_conftest = type(sys)('conftest')
-empty_conftest.__file__ = "?"
-sys.modules['pypy.lib.py.conftest'] = empty_conftest
+collect_ignore = ['./lib/py']
 
 # PyPy's command line extra options (these are added 
 # to py.test's standard options) 

Modified: pypy/branch/py11/pypy/module/__builtin__/test/test_import.py
==============================================================================
--- pypy/branch/py11/pypy/module/__builtin__/test/test_import.py	(original)
+++ pypy/branch/py11/pypy/module/__builtin__/test/test_import.py	Wed Nov 11 13:33:41 2009
@@ -92,7 +92,7 @@
             stream.close()
         if space.config.objspace.usepycfiles:
             # also create a lone .pyc file
-            p.join('lone.pyc').write(p.join('x.pyc').read())
+            p.join('lone.pyc').write(p.join('x.pyc').read(), mode='wb')
 
     return str(root)
 

Modified: pypy/branch/py11/pypy/module/_file/test/test_file_extra.py
==============================================================================
--- pypy/branch/py11/pypy/module/_file/test/test_file_extra.py	(original)
+++ pypy/branch/py11/pypy/module/_file/test/test_file_extra.py	Wed Nov 11 13:33:41 2009
@@ -19,7 +19,7 @@
 
 
 def setup_module(mod):
-    udir.join('sample').write(SAMPLE)
+    udir.join('sample').write(SAMPLE, 'wb')
 
 
 class BaseROTests:

Modified: pypy/branch/py11/pypy/module/bz2/test/test_bz2_file.py
==============================================================================
--- pypy/branch/py11/pypy/module/bz2/test/test_bz2_file.py	(original)
+++ pypy/branch/py11/pypy/module/bz2/test/test_bz2_file.py	Wed Nov 11 13:33:41 2009
@@ -15,7 +15,7 @@
     def create_temp_file(crlf=False):
         f = py.test.ensuretemp("bz2").join("foo")
         data = (DATA, DATA_CRLF)[crlf]
-        f.write(data)
+        f.write(data, 'wb')
 
     def create_broken_temp_file():
         f = py.test.ensuretemp("bz2").join("foo")