[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

Mon Mar 17 22:20:55 CET 2014

http://hg.python.org/cpython/rev/c425f81f7c4b
changeset: 89827:c425f81f7c4b
parent: 89825:007265795b1b
parent: 89826:1724846a8676
user: Benjamin Peterson <benjamin at python.org>
date: Mon Mar 17 16:20:50 2014 -0500
summary:
 merge 3.4
files:
 Lib/test/test_descr.py | 24 +++++++++++++++++++++++-
 Lib/test/test_types.py | 26 ++------------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4974,11 +4974,33 @@
 self._assert_is_copy(obj, objcopy2)
 
 
+class SharedKeyTests(unittest.TestCase):
+
+ @support.cpython_only
+ def test_subclasses(self):
+ # Verify that subclasses can share keys (per PEP 412)
+ class A:
+ pass
+ class B(A):
+ pass
+
+ a, b = A(), B()
+ self.assertEqual(sys.getsizeof(vars(a)), sys.getsizeof(vars(b)))
+ self.assertLess(sys.getsizeof(vars(a)), sys.getsizeof({}))
+ a.x, a.y, a.z, a.w = range(4)
+ self.assertNotEqual(sys.getsizeof(vars(a)), sys.getsizeof(vars(b)))
+ a2 = A()
+ self.assertEqual(sys.getsizeof(vars(a)), sys.getsizeof(vars(a2)))
+ self.assertLess(sys.getsizeof(vars(a)), sys.getsizeof({}))
+ b.u, b.v, b.w, b.t = range(4)
+ self.assertLess(sys.getsizeof(vars(b)), sys.getsizeof({}))
+
+
 def test_main():
 # Run all local test cases, with PTypesLongInitTest first.
 support.run_unittest(PTypesLongInitTest, OperatorsTest,
 ClassPropertiesAndMethods, DictProxyTests,
- MiscTests, PicklingTests)
+ MiscTests, PicklingTests, SharedKeyTests)
 
 if __name__ == "__main__":
 test_main()
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -1,6 +1,6 @@
 # Python test set -- part 6, built-in types
 
-from test.support import run_unittest, run_with_locale, cpython_only
+from test.support import run_unittest, run_with_locale
 import collections
 import pickle
 import locale
@@ -1170,31 +1170,9 @@
 self.assertEqual(ns, ns_roundtrip, pname)
 
 
-class SharedKeyTests(unittest.TestCase):
-
- @cpython_only
- def test_subclasses(self):
- # Verify that subclasses can share keys (per PEP 412)
- class A:
- pass
- class B(A):
- pass
-
- a, b = A(), B()
- self.assertEqual(sys.getsizeof(vars(a)), sys.getsizeof(vars(b)))
- self.assertLess(sys.getsizeof(vars(a)), sys.getsizeof({}))
- a.x, a.y, a.z, a.w = range(4)
- self.assertNotEqual(sys.getsizeof(vars(a)), sys.getsizeof(vars(b)))
- a2 = A()
- self.assertEqual(sys.getsizeof(vars(a)), sys.getsizeof(vars(a2)))
- self.assertLess(sys.getsizeof(vars(a)), sys.getsizeof({}))
- b.u, b.v, b.w, b.t = range(4)
- self.assertLess(sys.getsizeof(vars(b)), sys.getsizeof({}))
-
-
 def test_main():
 run_unittest(TypesTests, MappingProxyTests, ClassCreationTests,
- SimpleNamespaceTests, SharedKeyTests)
+ SimpleNamespaceTests)
 
 if __name__ == '__main__':
 test_main()
-- 
Repository URL: http://hg.python.org/cpython
