62d7207dd0
* Mon Aug 13 2012 David Malcolm <dmalcolm@redhat.com> - 3.3.0-0.3.b2 - 3.3b1 -> 3.3b2; drop upstreamed patch 152; refresh patches 3, 102, 111, 134, 153, 160; regenenerate autotools patch; rework systemtap patch to work correctly when LANG=C (patch 55); importlib.test was moved to test.test_importlib upstream
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('P2n15Pl4Pn9Pn11PI')
|
|
+ # 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('P2n15Pl4Pn9Pn11PI') + 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)
|