Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r69810:eae61b54e4fd
Date: 2014-03-07 12:16 -0800
http://bitbucket.org/pypy/pypy/changeset/eae61b54e4fd/
Log: merge default (ac3ce8b66c72)
diff --git a/pypy/module/_cffi_backend/__init__.py
b/pypy/module/_cffi_backend/__init__.py
--- a/pypy/module/_cffi_backend/__init__.py
+++ b/pypy/module/_cffi_backend/__init__.py
@@ -8,7 +8,7 @@
appleveldefs = {
}
interpleveldefs = {
- '__version__': 'space.wrap("0.8")',
+ '__version__': 'space.wrap("0.8.2")',
'load_library': 'libraryobj.load_library',
diff --git a/pypy/module/_cffi_backend/test/_backend_test_c.py
b/pypy/module/_cffi_backend/test/_backend_test_c.py
--- a/pypy/module/_cffi_backend/test/_backend_test_c.py
+++ b/pypy/module/_cffi_backend/test/_backend_test_c.py
@@ -3175,6 +3175,8 @@
assert alignof(BStruct) == 1
def test_packed_with_bitfields():
+ if sys.platform == "win32":
+ py.test.skip("testing gcc behavior")
BLong = new_primitive_type("long")
BChar = new_primitive_type("char")
BStruct = new_struct_type("struct foo")
@@ -3186,4 +3188,4 @@
def test_version():
# this test is here mostly for PyPy
- assert __version__ == "0.8"
+ assert __version__ == "0.8.2"
diff --git a/pypy/module/select/test/test_select.py
b/pypy/module/select/test/test_select.py
--- a/pypy/module/select/test/test_select.py
+++ b/pypy/module/select/test/test_select.py
@@ -275,6 +275,8 @@
self.make_server()
+ self.make_server()
+
self.sock.listen(1)
s2 = socket.socket()
_thread.start_new_thread(s2.connect, (self.sockaddress,))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
