f5250ecae7
- Refreshed patches: 55 (systemtap), 102 (lib64), 111 (no static lib), 114 (statvfs flags), 132 (unittest rpmbuild hooks), 134 (fix COUNT_ALLOCS in test_sys), 143 (tsc on ppc64), 146 (hashlib fips), 153 (test gdb noise), 157 (UID+GID overflows), 173 (ENOPROTOOPT in bind_port), 186 (dont raise from py_compile) - Removed patches: 129 (test_subprocess nonreadable dir - no longer fails in Koji), 142 (the mock issue that caused this is fixed) - Added patch 187 (remove thread atfork) - will be in next version - Refreshed script for checking pyc and pyo timestamps with new ignored files. - The fips patch is disabled for now until upstream makes a final decision what to do with sha3 implementation for 3.4.0.
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
diff -up Python-3.3.0b2/Lib/test/test_sys.py.fix-COUNT_ALLOCS-failure-in-test_sys Python-3.3.0b2/Lib/test/test_sys.py
|
|
--- Python-3.3.0b2/Lib/test/test_sys.py.fix-COUNT_ALLOCS-failure-in-test_sys 2012-08-11 02:54:16.000000000 -0400
|
|
+++ Python-3.3.0b2/Lib/test/test_sys.py 2012-08-13 14:50:15.253720597 -0400
|
|
@@ -835,12 +835,17 @@ class SizeofTest(unittest.TestCase):
|
|
# type
|
|
# static type: PyTypeObject
|
|
s = vsize('P2n15Pl4Pn9Pn11PIP')
|
|
+ # COUNT_ALLOCS adds a further 3 Py_ssize_t and 2 pointers:
|
|
+ if hasattr(sys, 'getcounts'):
|
|
+ s += struct.calcsize('3P2P')
|
|
check(int, s)
|
|
# (PyTypeObject + PyNumberMethods + PyMappingMethods +
|
|
# PySequenceMethods + PyBufferProcs + 4P)
|
|
s = vsize('P2n15Pl4Pn9Pn11PIP') + struct.calcsize('34P 3P 10P 2P 4P')
|
|
# Separate block for PyDictKeysObject with 4 entries
|
|
s += struct.calcsize("2nPn") + 4*struct.calcsize("n2P")
|
|
+ if hasattr(sys, 'getcounts'):
|
|
+ s += struct.calcsize('3P2P')
|
|
# class
|
|
class newstyleclass(object): pass
|
|
check(newstyleclass, s)
|