[pypy-commit] pypy py3k: Fix bz2 tests when run with the -A option.
amauryfa
noreply at buildbot.pypy.org
Tue Feb 19 00:05:40 CET 2013
Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r61429:df6d98fbc037
Date: 2013-02-18 23:27 +0100
http://bitbucket.org/pypy/pypy/changeset/df6d98fbc037/
Log: Fix bz2 tests when run with the -A option.
diff --git a/pypy/module/bz2/test/test_bz2_compdecomp.py b/pypy/module/bz2/test/test_bz2_compdecomp.py
--- a/pypy/module/bz2/test/test_bz2_compdecomp.py
+++ b/pypy/module/bz2/test/test_bz2_compdecomp.py
@@ -2,10 +2,9 @@
import py
-from pypy.interpreter.gateway import interp2app
from pypy.module.bz2.test.support import CheckAllocation
from pypy.module.bz2 import interp_bz2
-from pypy.interpreter.gateway import interp2app
+from pypy.interpreter import gateway
import os, py
HUGE_OK = False
@@ -17,18 +16,17 @@
def setup_module(mod):
DATA = 'BZh91AY&SY.\xc8N\x18\x00\x01>_\x80\x00\x10@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe00\x01\x99\xaa\x00\xc0\x03F\x86\x8c#&\x83F\x9a\x03\x06\xa6\xd0\xa6\x93M\x0fQ\xa7\xa8\x06\x804hh\x12$\x11\xa4i4\xf14S\xd2<Q\xb5\x0fH\xd3\xd4\xdd\xd5\x87\xbb\xf8\x94\r\x8f\xafI\x12\xe1\xc9\xf8/E\x00pu\x89\x12]\xc9\xbbDL\nQ\x0e\t1\x12\xdf\xa0\xc0\x97\xac2O9\x89\x13\x94\x0e\x1c7\x0ed\x95I\x0c\xaaJ\xa4\x18L\x10\x05#\x9c\xaf\xba\xbc/\x97\x8a#C\xc8\xe1\x8cW\xf9\xe2\xd0\xd6M\xa7\x8bXa<e\x84t\xcbL\xb3\xa7\xd9\xcd\xd1\xcb\x84.\xaf\xb3\xab\xab\xad`n}\xa0lh\tE,\x8eZ\x15\x17VH>\x88\xe5\xcd9gd6\x0b\n\xe9\x9b\xd5\x8a\x99\xf7\x08.K\x8ev\xfb\xf7xw\xbb\xdf\xa1\x92\xf1\xdd|/";\xa2\xba\x9f\xd5\xb1#A\xb6\xf6\xb3o\xc9\xc5y\\\xebO\xe7\x85\x9a\xbc\xb6f8\x952\xd5\xd7"%\x89>V,\xf7\xa6z\xe2\x9f\xa3\xdf\x11\x11"\xd6E)I\xa9\x13^\xca\xf3r\xd0\x03U\x922\xf26\xec\xb6\xed\x8b\xc3U\x13\x9d\xc5\x170\xa4\xfa^\x92\xacDF\x8a\x97\xd6\x19\xfe\xdd\xb8\xbd\x1a\x9a\x19\xa3\x80ankR\x8b\xe5\xd83]\xa9\xc6\x08\x82f\xf6\xb9"6l$\xb8j@\xc0\x8a\xb0l1..\xbak\x83ls\x15\xbc\xf4\xc1\x13\xbe\xf8E\xb8\x9d\r\xa8\x9dk\x84\xd3n\xfa\xacQ\x07\xb1%y\xaav\xb4\x08\xe0z\x1b\x16\xf5\x04\xe9\xcc\xb9\x08z\x1en7.G\xfc]\xc9\x14\xe1B@\xbb!8`'
- def decompress(space, w_data):
- import popen2
+ def decompress(cls, data):
+ import subprocess
import bz2
- data = space.bytes_w(w_data)
- pop = popen2.Popen3("bunzip2", capturestderr=1)
- pop.tochild.write(data)
- pop.tochild.close()
- res = pop.fromchild.read()
- pop.fromchild.close()
+ pop = subprocess.Popen("bunzip2", stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ pop.stdin.write(data)
+ stdout, stderr = pop.communicate()
+ res = stdout
if pop.wait() != 0:
res = bz2.decompress(data)
- return space.wrapbytes(res)
+ return res
mod.TEXT = 'root:x:0:0:root:/root:/bin/bash\nbin:x:1:1:bin:/bin:\ndaemon:x:2:2:daemon:/sbin:\nadm:x:3:4:adm:/var/adm:\nlp:x:4:7:lp:/var/spool/lpd:\nsync:x:5:0:sync:/sbin:/bin/sync\nshutdown:x:6:0:shutdown:/sbin:/sbin/shutdown\nhalt:x:7:0:halt:/sbin:/sbin/halt\nmail:x:8:12:mail:/var/spool/mail:\nnews:x:9:13:news:/var/spool/news:\nuucp:x:10:14:uucp:/var/spool/uucp:\noperator:x:11:0:operator:/root:\ngames:x:12:100:games:/usr/games:\ngopher:x:13:30:gopher:/usr/lib/gopher-data:\nftp:x:14:50:FTP User:/var/ftp:/bin/bash\nnobody:x:65534:65534:Nobody:/home:\npostfix:x:100:101:postfix:/var/spool/postfix:\nniemeyer:x:500:500::/home/niemeyer:/bin/bash\npostgres:x:101:102:PostgreSQL Server:/var/lib/pgsql:/bin/bash\nmysql:x:102:103:MySQL server:/var/lib/mysql:/bin/bash\nwww:x:103:104::/var/www:/bin/false\n'
mod.DATA = DATA
@@ -48,9 +46,12 @@
def setup_class(cls):
cls.w_TEXT = cls.space.wrapbytes(TEXT)
if cls.runappdirect:
- cls.w_decompress = lambda self, *args: decompress(cls.space, *args)
+ cls.w_decompress = decompress
else:
- cls.w_decompress = cls.space.wrap(interp2app(decompress))
+ @gateway.unwrap_spec(data=bytes)
+ def decompress_w(space, data):
+ return space.wrapbytes(decompress(cls, data))
+ cls.w_decompress = cls.space.wrap(gateway.interp2app(decompress_w))
cls.w_HUGE_OK = cls.space.wrap(HUGE_OK)
def test_creation(self):
@@ -189,9 +190,12 @@
cls.w_TEXT = cls.space.wrapbytes(TEXT)
cls.w_DATA = cls.space.wrapbytes(DATA)
if cls.runappdirect:
- cls.w_decompress = lambda self, *args: decompress(cls.space, *args)
+ cls.w_decompress = decompress
else:
- cls.w_decompress = cls.space.wrap(interp2app(decompress))
+ @gateway.unwrap_spec(data=bytes)
+ def decompress_w(space, data):
+ return space.wrapbytes(decompress(cls, data))
+ cls.w_decompress = cls.space.wrap(gateway.interp2app(decompress_w))
cls.w_HUGE_OK = cls.space.wrap(HUGE_OK)
def test_compress_function(self):
diff --git a/pypy/module/bz2/test/test_bz2_file.py b/pypy/module/bz2/test/test_bz2_file.py
--- a/pypy/module/bz2/test/test_bz2_file.py
+++ b/pypy/module/bz2/test/test_bz2_file.py
@@ -6,7 +6,7 @@
import py
-from pypy.interpreter.gateway import unwrap_spec, interp2app
+from pypy.interpreter import gateway
from pypy.module.bz2.test.support import CheckAllocation
@@ -18,29 +18,27 @@
DATA = 'BZh91AY&SY.\xc8N\x18\x00\x01>_\x80\x00\x10@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe00\x01\x99\xaa\x00\xc0\x03F\x86\x8c#&\x83F\x9a\x03\x06\xa6\xd0\xa6\x93M\x0fQ\xa7\xa8\x06\x804hh\x12$\x11\xa4i4\xf14S\xd2<Q\xb5\x0fH\xd3\xd4\xdd\xd5\x87\xbb\xf8\x94\r\x8f\xafI\x12\xe1\xc9\xf8/E\x00pu\x89\x12]\xc9\xbbDL\nQ\x0e\t1\x12\xdf\xa0\xc0\x97\xac2O9\x89\x13\x94\x0e\x1c7\x0ed\x95I\x0c\xaaJ\xa4\x18L\x10\x05#\x9c\xaf\xba\xbc/\x97\x8a#C\xc8\xe1\x8cW\xf9\xe2\xd0\xd6M\xa7\x8bXa<e\x84t\xcbL\xb3\xa7\xd9\xcd\xd1\xcb\x84.\xaf\xb3\xab\xab\xad`n}\xa0lh\tE,\x8eZ\x15\x17VH>\x88\xe5\xcd9gd6\x0b\n\xe9\x9b\xd5\x8a\x99\xf7\x08.K\x8ev\xfb\xf7xw\xbb\xdf\xa1\x92\xf1\xdd|/";\xa2\xba\x9f\xd5\xb1#A\xb6\xf6\xb3o\xc9\xc5y\\\xebO\xe7\x85\x9a\xbc\xb6f8\x952\xd5\xd7"%\x89>V,\xf7\xa6z\xe2\x9f\xa3\xdf\x11\x11"\xd6E)I\xa9\x13^\xca\xf3r\xd0\x03U\x922\xf26\xec\xb6\xed\x8b\xc3U\x13\x9d\xc5\x170\xa4\xfa^\x92\xacDF\x8a\x97\xd6\x19\xfe\xdd\xb8\xbd\x1a\x9a\x19\xa3\x80ankR\x8b\xe5\xd83]\xa9\xc6\x08\x82f\xf6\xb9"6l$\xb8j@\xc0\x8a\xb0l1..\xbak\x83ls\x15\xbc\xf4\xc1\x13\xbe\xf8E\xb8\x9d\r\xa8\x9dk\x84\xd3n\xfa\xacQ\x07\xb1%y\xaav\xb4\x08\xe0z\x1b\x16\xf5\x04\xe9\xcc\xb9\x08z\x1en7.G\xfc]\xc9\x14\xe1B@\xbb!8`'
DATA_CRLF = 'BZh91AY&SY\xaez\xbbN\x00\x01H\xdf\x80\x00\x12@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe0@\x01\xbc\xc6`\x86*\x8d=M\xa9\x9a\x86\xd0L@\x0fI\xa6!\xa1\x13\xc8\x88jdi\x8d@\x03@\x1a\x1a\x0c\x0c\x83 \x00\xc4h2\x19\x01\x82D\x84e\t\xe8\x99\x89\x19\x1ah\x00\r\x1a\x11\xaf\x9b\x0fG\xf5(\x1b\x1f?\t\x12\xcf\xb5\xfc\x95E\x00ps\x89\x12^\xa4\xdd\xa2&\x05(\x87\x04\x98\x89u\xe40%\xb6\x19\'\x8c\xc4\x89\xca\x07\x0e\x1b!\x91UIFU%C\x994!DI\xd2\xfa\xf0\xf1N8W\xde\x13A\xf5\x9cr%?\x9f3;I45A\xd1\x8bT\xb1<l\xba\xcb_\xc00xY\x17r\x17\x88\x08\x08@\xa0\ry@\x10\x04$)`\xf2\xce\x89z\xb0s\xec\x9b.iW\x9d\x81\xb5-+t\x9f\x1a\'\x97dB\xf5x\xb5\xbe.[.\xd7\x0e\x81\xe7\x08\x1cN`\x88\x10\xca\x87\xc3!"\x80\x92R\xa1/\xd1\xc0\xe6mf\xac\xbd\x99\xcca\xb3\x8780>\xa4\xc7\x8d\x1a\\"\xad\xa1\xabyBg\x15\xb9l\x88\x88\x91k"\x94\xa4\xd4\x89\xae*\xa6\x0b\x10\x0c\xd6\xd4m\xe86\xec\xb5j\x8a\x86j\';\xca.\x01I\xf2\xaaJ\xe8\x88\x8cU+t3\xfb\x0c\n\xa33\x13r2\r\x16\xe0\xb3(\xbf\x1d\x83r\xe7M\xf0D\x1365\xd8\x88\xd3\xa4\x92\xcb2\x06\x04\\\xc1\xb0\xea//\xbek&\xd8\xe6+t\xe5\xa1\x13\xada\x16\xder5"w]\xa2i\xb7[\x97R \xe2IT\xcd;Z\x04dk4\xad\x8a\t\xd3\x81z\x10\xf1:^`\xab\x1f\xc5\xdc\x91N\x14$+\x9e\xae\xd3\x80'
- @unwrap_spec(crlf=bool)
- def create_temp_file(space, crlf=False):
- f = py.test.ensuretemp("bz2").join("foo")
- data = (DATA, DATA_CRLF)[crlf]
- f.write(data, 'wb')
+ def create_temp_file(cls, crlf=False):
+ with open(cls.temppath, 'wb') as f:
+ data = (cls.DATA, cls.DATA_CRLF)[crlf]
+ f.write(data)
- def create_broken_temp_file():
- f = py.test.ensuretemp("bz2").join("foo")
- data = DATA[:100]
- f.write(data, 'wb')
+ def create_broken_temp_file(cls):
+ with open(cls.temppath, 'wb') as f:
+ data = cls.DATA[:100]
+ f.write(data)
- @unwrap_spec(data=str)
- def decompress(space, data):
- import popen2
+ def decompress(cls, data):
+ import subprocess
import bz2
- pop = popen2.Popen3("bunzip2", capturestderr=1)
- pop.tochild.write(data)
- pop.tochild.close()
- res = pop.fromchild.read()
- pop.fromchild.close()
+ pop = subprocess.Popen("bunzip2", stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ pop.stdin.write(data)
+ stdout, stderr = pop.communicate()
+ res = stdout
if pop.wait() != 0:
res = bz2.decompress(data)
- return space.wrapbytes(res)
+ return res
mod.TEXT = 'root:x:0:0:root:/root:/bin/bash\nbin:x:1:1:bin:/bin:\ndaemon:x:2:2:daemon:/sbin:\nadm:x:3:4:adm:/var/adm:\nlp:x:4:7:lp:/var/spool/lpd:\nsync:x:5:0:sync:/sbin:/bin/sync\nshutdown:x:6:0:shutdown:/sbin:/sbin/shutdown\nhalt:x:7:0:halt:/sbin:/sbin/halt\nmail:x:8:12:mail:/var/spool/mail:\nnews:x:9:13:news:/var/spool/news:\nuucp:x:10:14:uucp:/var/spool/uucp:\noperator:x:11:0:operator:/root:\ngames:x:12:100:games:/usr/games:\ngopher:x:13:30:gopher:/usr/lib/gopher-data:\nftp:x:14:50:FTP User:/var/ftp:/bin/bash\nnobody:x:65534:65534:Nobody:/home:\npostfix:x:100:101:postfix:/var/spool/postfix:\nniemeyer:x:500:500::/home/niemeyer:/bin/bash\npostgres:x:101:102:PostgreSQL Server:/var/lib/pgsql:/bin/bash\nmysql:x:102:103:MySQL server:/var/lib/mysql:/bin/bash\nwww:x:103:104::/var/www:/bin/false\n'
mod.DATA = DATA
@@ -61,18 +59,32 @@
def setup_class(cls):
cls.w_TEXT = cls.space.wrapbytes(TEXT)
+ cls.DATA = DATA
cls.w_DATA = cls.space.wrapbytes(DATA)
+ cls.DATA_CRLF = DATA_CRLF
cls.w_DATA_CRLF = cls.space.wrapbytes(DATA_CRLF)
- cls.w_temppath = cls.space.wrap(
- str(py.test.ensuretemp("bz2").join("foo")))
+ cls.temppath = str(py.test.ensuretemp("bz2").join("foo"))
+ cls.w_temppath = cls.space.wrap(cls.temppath)
if cls.runappdirect:
cls.w_create_temp_file = create_temp_file
- cls.w_create_broken_temp_file = lambda self: create_broken_temp_file()
- cls.w_decompress = lambda self, *args: decompress(cls.space, *args)
+ cls.w_create_broken_temp_file = create_broken_temp_file
+ cls.w_decompress = decompress
else:
- cls.w_create_temp_file = cls.space.wrap(interp2app(create_temp_file))
- cls.w_decompress = cls.space.wrap(interp2app(decompress))
- cls.w_create_broken_temp_file = cls.space.wrap(interp2app(create_broken_temp_file))
+ @gateway.unwrap_spec(crlf=bool)
+ def create_temp_file_w(crlf=False):
+ create_temp_file(cls, crlf)
+ cls.w_create_temp_file = cls.space.wrap(
+ gateway.interp2app(create_temp_file_w))
+
+ @gateway.unwrap_spec(data=bytes)
+ def decompress_w(space, data):
+ return space.wrapbytes(decompress(cls, data))
+ cls.w_decompress = cls.space.wrap(gateway.interp2app(decompress_w))
+
+ def create_broken_temp_file_w():
+ create_broken_temp_file(cls)
+ cls.w_create_broken_temp_file = cls.space.wrap(
+ gateway.interp2app(create_broken_temp_file_w))
cls.w_random_data = cls.space.wrapbytes(RANDOM_DATA)
def test_attributes(self):
diff --git a/pypy/tool/pytest/apptest.py b/pypy/tool/pytest/apptest.py
--- a/pypy/tool/pytest/apptest.py
+++ b/pypy/tool/pytest/apptest.py
@@ -70,7 +70,7 @@
# "def w_method(self)"
code = py.code.Code(value)
defs.append(str(code.source()))
- defs.append("type(self).%s = w_%s\n" % (symbol, symbol))
+ defs.append("type(self).%s = %s\n" % (symbol, value.__name__))
elif isinstance(value, types.ModuleType):
name = value.__name__
defs.append("import %s; self.%s = %s\n" % (name, symbol, name))
More information about the pypy-commit
mailing list