Mailman 3 March 2010 - Python-checkins

Daily py3k reference leaks (r79531): sum=0
by solipsis＠pitrou.net 31 Mar '10

31 Mar '10

py3k results for svn r79531 (hg cset abf8b1bf895a) -------------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflogqsiTcd', '-x', 'test_httpservers']

1 0

r79541 - python/trunk/PCbuild/rt.bat
by ezio.melotti 31 Mar '10

31 Mar '10

Author: ezio.melotti Date: Thu Apr 1 00:43:31 2010 New Revision: 79541 Log: Add -Wd and -3 to the flags used to run the tests on Windows. Modified: python/trunk/PCbuild/rt.bat Modified: python/trunk/PCbuild/rt.bat ============================================================================== --- python/trunk/PCbuild/rt.bat (original) +++ python/trunk/PCbuild/rt.bat Thu Apr 1 00:43:31 2010 @@ -40,7 +40,7 @@ PATH %PATH%;..\..\%tcltk%\bin set exe=%prefix%\python%suffix% -set cmd=%exe% %dashO% -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 +set cmd=%exe% %dashO% -Wd -3 -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 if defined qmode goto Qmode echo Deleting .pyc/.pyo files ...

1 0

r79540 - python/trunk/Makefile.pre.in
by ezio.melotti 31 Mar '10

31 Mar '10

Author: ezio.melotti Date: Thu Apr 1 00:18:09 2010 New Revision: 79540 Log: Add -Wd and -3 to the flags used to run the tests. Modified: python/trunk/Makefile.pre.in Modified: python/trunk/Makefile.pre.in ============================================================================== --- python/trunk/Makefile.pre.in (original) +++ python/trunk/Makefile.pre.in Thu Apr 1 00:18:09 2010 @@ -683,13 +683,13 @@ # In the past, we've had problems where bugs in the marshalling or # elsewhere caused bytecode read from .pyc files to behave differently # than bytecode generated directly from a .py source file. Sometimes -# the bytecode read from a .pyc file had the bug, somtimes the directly +# the bytecode read from a .pyc file had the bug, sometimes the directly # generated bytecode. This is sometimes a very shy bug needing a lot of # sample data. TESTOPTS= -l $(EXTRATESTOPTS) TESTPROG= $(srcdir)/Lib/test/regrtest.py -TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -E -tt +TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt test: all platform -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)

1 0

r79539 - in python/trunk/Lib/test: test___all__.py test_argparse.py test_coercion.py test_commands.py test_complex.py test_contextlib.py test_cookie.py test_descr.py test_doctest.py test_exceptions.py test_global.py test_hmac.py test_int_literal.py test_io.py test_macostools.py test_pep352.py test_re.py test_sundry.py test_symtable.py test_urllibnet.py test_zipimport_support.py
by florent.xicluna 31 Mar '10

31 Mar '10

Author: florent.xicluna Date: Thu Apr 1 00:01:03 2010 New Revision: 79539 Log: Replace catch_warnings with check_warnings when it makes sense. Use assertRaises context manager to simplify some tests. Modified: python/trunk/Lib/test/test___all__.py python/trunk/Lib/test/test_argparse.py python/trunk/Lib/test/test_coercion.py python/trunk/Lib/test/test_commands.py python/trunk/Lib/test/test_complex.py python/trunk/Lib/test/test_contextlib.py python/trunk/Lib/test/test_cookie.py python/trunk/Lib/test/test_descr.py python/trunk/Lib/test/test_doctest.py python/trunk/Lib/test/test_exceptions.py python/trunk/Lib/test/test_global.py python/trunk/Lib/test/test_hmac.py python/trunk/Lib/test/test_int_literal.py python/trunk/Lib/test/test_io.py python/trunk/Lib/test/test_macostools.py python/trunk/Lib/test/test_pep352.py python/trunk/Lib/test/test_re.py python/trunk/Lib/test/test_sundry.py python/trunk/Lib/test/test_symtable.py python/trunk/Lib/test/test_urllibnet.py python/trunk/Lib/test/test_zipimport_support.py Modified: python/trunk/Lib/test/test___all__.py ============================================================================== --- python/trunk/Lib/test/test___all__.py (original) +++ python/trunk/Lib/test/test___all__.py Thu Apr 1 00:01:03 2010 @@ -4,7 +4,6 @@ from test import test_support as support import os import sys -import warnings class NoAll(RuntimeError): @@ -18,9 +17,8 @@ def check_all(self, modname): names = {} - with warnings.catch_warnings(): - warnings.filterwarnings("ignore", ".* (module|package)", - DeprecationWarning) + with support.check_warnings((".* (module|package)", + DeprecationWarning), quiet=True): try: exec "import %s" % modname in names except: Modified: python/trunk/Lib/test/test_argparse.py ============================================================================== --- python/trunk/Lib/test/test_argparse.py (original) +++ python/trunk/Lib/test/test_argparse.py Thu Apr 1 00:01:03 2010 @@ -7,7 +7,6 @@ import textwrap import tempfile import unittest -import warnings import argparse from StringIO import StringIO @@ -4160,21 +4159,12 @@ self.assertTrue(hasattr(argparse, name)) def test_main(): - with warnings.catch_warnings(): - # silence warnings about version argument - these are expected - warnings.filterwarnings( - action='ignore', - message='The "version" argument to ArgumentParser is deprecated.', - category=DeprecationWarning) - warnings.filterwarnings( - action='ignore', - message='The format_version method is deprecated', - category=DeprecationWarning) - warnings.filterwarnings( - action='ignore', - message='The print_version method is deprecated', - category=DeprecationWarning) - + # silence warnings about version argument - these are expected + with test_support.check_warnings( + ('The "version" argument to ArgumentParser is deprecated.', + DeprecationWarning), + ('The (format|print)_version method is deprecated', + DeprecationWarning)): test_support.run_unittest(__name__) # Remove global references to avoid looking like we have refleaks. RFile.seen = {} Modified: python/trunk/Lib/test/test_coercion.py ============================================================================== --- python/trunk/Lib/test/test_coercion.py (original) +++ python/trunk/Lib/test/test_coercion.py Thu Apr 1 00:01:03 2010 @@ -1,7 +1,6 @@ import copy -import warnings import unittest -from test.test_support import run_unittest, TestFailed +from test.test_support import run_unittest, TestFailed, check_warnings # Fake a number that implements numeric methods through __coerce__ class CoerceNumber: @@ -223,12 +222,6 @@ infix_results[key] = res -with warnings.catch_warnings(): - warnings.filterwarnings("ignore", "classic int division", - DeprecationWarning) - process_infix_results() -# now infix_results has two lists of results for every pairing. - prefix_binops = [ 'divmod' ] prefix_results = [ [(1,0), (1L,0L), (0.0,2.0), ((1+0j),0j), TE, TE, TE, TE, (1,0)], @@ -339,11 +332,13 @@ raise exc def test_main(): - with warnings.catch_warnings(): - warnings.filterwarnings("ignore", "complex divmod.., // and % " - "are deprecated", DeprecationWarning) - warnings.filterwarnings("ignore", "classic (int|long) division", - DeprecationWarning) + with check_warnings(("complex divmod.., // and % are deprecated", + DeprecationWarning), + ("classic (int|long) division", DeprecationWarning), + quiet=True): + process_infix_results() + # now infix_results has two lists of results for every pairing. + run_unittest(CoercionTest) if __name__ == "__main__": Modified: python/trunk/Lib/test/test_commands.py ============================================================================== --- python/trunk/Lib/test/test_commands.py (original) +++ python/trunk/Lib/test/test_commands.py Thu Apr 1 00:01:03 2010 @@ -4,12 +4,9 @@ ''' import unittest import os, tempfile, re -import warnings -warnings.filterwarnings('ignore', r".*commands.getstatus.. is deprecated", - DeprecationWarning) - -from test.test_support import run_unittest, reap_children, import_module +from test.test_support import run_unittest, reap_children, import_module, \ + check_warnings # Silence Py3k warning commands = import_module('commands', deprecated=True) @@ -59,7 +56,9 @@ /\. # and end with the name of the file. ''' - self.assertTrue(re.match(pat, commands.getstatus("/."), re.VERBOSE)) + with check_warnings((".*commands.getstatus.. is deprecated", + DeprecationWarning)): + self.assertTrue(re.match(pat, commands.getstatus("/."), re.VERBOSE)) def test_main(): Modified: python/trunk/Lib/test/test_complex.py ============================================================================== --- python/trunk/Lib/test/test_complex.py (original) +++ python/trunk/Lib/test/test_complex.py Thu Apr 1 00:01:03 2010 @@ -1,13 +1,6 @@ -import unittest, os +import unittest from test import test_support -import warnings -warnings.filterwarnings( - "ignore", - category=DeprecationWarning, - message=".*complex divmod.*are deprecated" -) - from random import random from math import atan2, isnan, copysign @@ -464,10 +457,7 @@ finally: if (fo is not None) and (not fo.closed): fo.close() - try: - os.remove(test_support.TESTFN) - except (OSError, IOError): - pass + test_support.unlink(test_support.TESTFN) def test_getnewargs(self): self.assertEqual((1+2j).__getnewargs__(), (1.0, 2.0)) @@ -613,7 +603,9 @@ self.assertEqual('{0:F}'.format(complex(NAN, NAN)), 'NAN+NANj') def test_main(): - test_support.run_unittest(ComplexTest) + with test_support.check_warnings(("complex divmod.., // and % are " + "deprecated", DeprecationWarning)): + test_support.run_unittest(ComplexTest) if __name__ == "__main__": test_main() Modified: python/trunk/Lib/test/test_contextlib.py ============================================================================== --- python/trunk/Lib/test/test_contextlib.py (original) +++ python/trunk/Lib/test/test_contextlib.py Thu Apr 1 00:01:03 2010 @@ -1,14 +1,12 @@ """Unit tests for contextlib.py, and other context managers.""" - -import os import sys import tempfile import unittest import threading from contextlib import * # Tests __all__ from test import test_support -import warnings + class ContextManagerTestCase(unittest.TestCase): @@ -34,16 +32,12 @@ yield 42 finally: state.append(999) - try: + with self.assertRaises(ZeroDivisionError): with woohoo() as x: self.assertEqual(state, [1]) self.assertEqual(x, 42) state.append(x) raise ZeroDivisionError() - except ZeroDivisionError: - pass - else: - self.fail("Expected ZeroDivisionError") self.assertEqual(state, [1, 42, 999]) def test_contextmanager_no_reraise(self): @@ -144,15 +138,12 @@ yield 5 finally: state.append(6) - try: + with self.assertRaises(ZeroDivisionError): with nested(a(), b()) as (x, y): state.append(x) state.append(y) - 1/0 - except ZeroDivisionError: - self.assertEqual(state, [1, 4, 2, 5, 6, 3]) - else: - self.fail("Didn't raise ZeroDivisionError") + 1 // 0 + self.assertEqual(state, [1, 4, 2, 5, 6, 3]) def test_nested_right_exception(self): @contextmanager @@ -166,15 +157,10 @@ raise Exception() except: pass - try: + with self.assertRaises(ZeroDivisionError): with nested(a(), b()) as (x, y): - 1/0 - except ZeroDivisionError: - self.assertEqual((x, y), (1, 2)) - except Exception: - self.fail("Reraised wrong exception") - else: - self.fail("Didn't raise ZeroDivisionError") + 1 // 0 + self.assertEqual((x, y), (1, 2)) def test_nested_b_swallows(self): @contextmanager @@ -189,7 +175,7 @@ pass try: with nested(a(), b()): - 1/0 + 1 // 0 except ZeroDivisionError: self.fail("Didn't swallow ZeroDivisionError") @@ -252,14 +238,11 @@ state.append(1) x = C() self.assertEqual(state, []) - try: + with self.assertRaises(ZeroDivisionError): with closing(x) as y: self.assertEqual(x, y) - 1/0 - except ZeroDivisionError: - self.assertEqual(state, [1]) - else: - self.fail("Didn't raise ZeroDivisionError") + 1 // 0 + self.assertEqual(state, [1]) class FileContextTestCase(unittest.TestCase): @@ -272,20 +255,14 @@ f.write("Booh\n") self.assertTrue(f.closed) f = None - try: + with self.assertRaises(ZeroDivisionError): with open(tfn, "r") as f: self.assertFalse(f.closed) self.assertEqual(f.read(), "Booh\n") - 1/0 - except ZeroDivisionError: - self.assertTrue(f.closed) - else: - self.fail("Didn't raise ZeroDivisionError") + 1 // 0 + self.assertTrue(f.closed) finally: - try: - os.remove(tfn) - except os.error: - pass + test_support.unlink(tfn) class LockContextTestCase(unittest.TestCase): @@ -294,14 +271,11 @@ with lock: self.assertTrue(locked()) self.assertFalse(locked()) - try: + with self.assertRaises(ZeroDivisionError): with lock: self.assertTrue(locked()) - 1/0 - except ZeroDivisionError: - self.assertFalse(locked()) - else: - self.fail("Didn't raise ZeroDivisionError") + 1 // 0 + self.assertFalse(locked()) def testWithLock(self): lock = threading.Lock() @@ -339,8 +313,9 @@ # This is needed to make the test actually run under regrtest.py! def test_main(): - with warnings.catch_warnings(): - warnings.simplefilter('ignore') + with test_support.check_warnings(("With-statements now directly support " + "multiple context managers", + DeprecationWarning)): test_support.run_unittest(__name__) if __name__ == "__main__": Modified: python/trunk/Lib/test/test_cookie.py ============================================================================== --- python/trunk/Lib/test/test_cookie.py (original) +++ python/trunk/Lib/test/test_cookie.py Thu Apr 1 00:01:03 2010 @@ -1,13 +1,9 @@ # Simple test suite for Cookie.py -from test.test_support import run_unittest, run_doctest +from test.test_support import run_unittest, run_doctest, check_warnings import unittest import Cookie -import warnings -warnings.filterwarnings("ignore", - ".* class is insecure.*", - DeprecationWarning) class CookieTests(unittest.TestCase): # Currently this only tests SimpleCookie @@ -76,7 +72,9 @@ def test_main(): run_unittest(CookieTests) - run_doctest(Cookie) + with check_warnings(('.+Cookie class is insecure; do not use it', + DeprecationWarning)): + run_doctest(Cookie) if __name__ == '__main__': test_main() Modified: python/trunk/Lib/test/test_descr.py ============================================================================== --- python/trunk/Lib/test/test_descr.py (original) +++ python/trunk/Lib/test/test_descr.py Thu Apr 1 00:01:03 2010 @@ -2,7 +2,6 @@ import sys import types import unittest -import warnings from copy import deepcopy from test import test_support @@ -59,15 +58,6 @@ expr = '%s a' % expr self.unops[name] = expr - def setUp(self): - self.original_filters = warnings.filters[:] - warnings.filterwarnings("ignore", - r'complex divmod, // and % are deprecated$', - DeprecationWarning, r'(<string>|%s)$' % __name__) - - def tearDown(self): - warnings.filters = self.original_filters - def unop_test(self, a, res, expr="len(a)", meth="__len__"): d = {'a': a} self.assertEqual(eval(expr, d), res) @@ -4622,11 +4612,15 @@ def test_main(): - with test_support.check_py3k_warnings( + deprecations = [(r'complex divmod, // and % are deprecated$', + DeprecationWarning)] + if sys.py3kwarning: + deprecations += [ ("classic (int|long) division", DeprecationWarning), ("coerce.. not supported", DeprecationWarning), ("Overriding __cmp__ ", DeprecationWarning), - (".+__(get|set|del)slice__ has been removed", DeprecationWarning)): + (".+__(get|set|del)slice__ has been removed", DeprecationWarning)] + with test_support.check_warnings(*deprecations): # Run all local test cases, with PTypesLongInitTest first. test_support.run_unittest(PTypesLongInitTest, OperatorsTest, ClassPropertiesAndMethods, DictProxyTests) Modified: python/trunk/Lib/test/test_doctest.py ============================================================================== --- python/trunk/Lib/test/test_doctest.py (original) +++ python/trunk/Lib/test/test_doctest.py Thu Apr 1 00:01:03 2010 @@ -3,9 +3,9 @@ Test script for doctest. """ +import sys from test import test_support import doctest -import warnings # NOTE: There are some additional tests relating to interaction with # zipimport in the test_zipimport_support test module. @@ -2458,12 +2458,13 @@ test_support.run_doctest(doctest, verbosity=True) from test import test_doctest - with test_support.check_py3k_warnings( - ("backquote not supported", SyntaxWarning), - ("execfile.. not supported", DeprecationWarning)): - # Ignore all warnings about the use of class Tester in this module. - warnings.filterwarnings("ignore", "class Tester is deprecated", - DeprecationWarning) + + # Ignore all warnings about the use of class Tester in this module. + deprecations = [("class Tester is deprecated", DeprecationWarning)] + if sys.py3kwarning: + deprecations += [("backquote not supported", SyntaxWarning), + ("execfile.. not supported", DeprecationWarning)] + with test_support.check_warnings(*deprecations): # Check the doctest cases defined here: test_support.run_doctest(test_doctest, verbosity=True) Modified: python/trunk/Lib/test/test_exceptions.py ============================================================================== --- python/trunk/Lib/test/test_exceptions.py (original) +++ python/trunk/Lib/test/test_exceptions.py Thu Apr 1 00:01:03 2010 @@ -4,9 +4,9 @@ import sys import unittest import pickle, cPickle -import warnings -from test.test_support import TESTFN, unlink, run_unittest, captured_output +from test.test_support import (TESTFN, unlink, run_unittest, captured_output, + check_warnings) from test.test_pep352 import ignore_deprecation_warnings # XXX This is not really enough, each *operation* should be tested! @@ -308,24 +308,19 @@ # Accessing BaseException.message and relying on its value set by # BaseException.__init__ triggers a deprecation warning. exc = BaseException("foo") - with warnings.catch_warnings(record=True) as w: - warnings.simplefilter('default') - self.assertEquals(exc.message, "foo") - self.assertEquals(len(w), 1) - self.assertEquals(w[0].category, DeprecationWarning) - self.assertEquals( - str(w[0].message), - "BaseException.message has been deprecated as of Python 2.6") - + with check_warnings(("BaseException.message has been deprecated " + "as of Python 2.6", DeprecationWarning)) as w: + self.assertEqual(exc.message, "foo") + self.assertEqual(len(w.warnings), 1) def testRegularMessageAttribute(self): # Accessing BaseException.message after explicitly setting a value # for it does not trigger a deprecation warning. exc = BaseException("foo") exc.message = "bar" - with warnings.catch_warnings(record=True) as w: - self.assertEquals(exc.message, "bar") - self.assertEquals(len(w), 0) + with check_warnings(quiet=True) as w: + self.assertEqual(exc.message, "bar") + self.assertEqual(len(w.warnings), 0) # Deleting the message is supported, too. del exc.message with self.assertRaises(AttributeError): Modified: python/trunk/Lib/test/test_global.py ============================================================================== --- python/trunk/Lib/test/test_global.py (original) +++ python/trunk/Lib/test/test_global.py Thu Apr 1 00:01:03 2010 @@ -2,9 +2,8 @@ from test.test_support import run_unittest, check_syntax_error import unittest - import warnings -warnings.filterwarnings("error", module="<test string>") + class GlobalTests(unittest.TestCase): @@ -45,7 +44,9 @@ def test_main(): - run_unittest(GlobalTests) + with warnings.catch_warnings(): + warnings.filterwarnings("error", module="<test string>") + run_unittest(GlobalTests) if __name__ == "__main__": test_main() Modified: python/trunk/Lib/test/test_hmac.py ============================================================================== --- python/trunk/Lib/test/test_hmac.py (original) +++ python/trunk/Lib/test/test_hmac.py Thu Apr 1 00:01:03 2010 @@ -213,19 +213,13 @@ with warnings.catch_warnings(): warnings.simplefilter('error', RuntimeWarning) - try: + with self.assertRaises(RuntimeWarning): hmac.HMAC('a', 'b', digestmod=MockCrazyHash) - except RuntimeWarning: - pass - else: self.fail('Expected warning about missing block_size') MockCrazyHash.block_size = 1 - try: + with self.assertRaises(RuntimeWarning): hmac.HMAC('a', 'b', digestmod=MockCrazyHash) - except RuntimeWarning: - pass - else: self.fail('Expected warning about small block_size') Modified: python/trunk/Lib/test/test_int_literal.py ============================================================================== --- python/trunk/Lib/test/test_int_literal.py (original) +++ python/trunk/Lib/test/test_int_literal.py Thu Apr 1 00:01:03 2010 @@ -6,9 +6,6 @@ import unittest from test import test_support -import warnings -warnings.filterwarnings("ignore", "hex/oct constants", FutureWarning, - "<string>") class TestHexOctBin(unittest.TestCase): Modified: python/trunk/Lib/test/test_io.py ============================================================================== --- python/trunk/Lib/test/test_io.py (original) +++ python/trunk/Lib/test/test_io.py Thu Apr 1 00:01:03 2010 @@ -29,7 +29,6 @@ import threading import random import unittest -import warnings import weakref import abc from itertools import cycle, count Modified: python/trunk/Lib/test/test_macostools.py ============================================================================== --- python/trunk/Lib/test/test_macostools.py (original) +++ python/trunk/Lib/test/test_macostools.py Thu Apr 1 00:01:03 2010 @@ -23,14 +23,8 @@ rfp.close() def tearDown(self): - try: - os.unlink(test_support.TESTFN) - except: - pass - try: - os.unlink(TESTFN2) - except: - pass + test_support.unlink(test_support.TESTFN) + test_support.unlink(TESTFN2) def compareData(self): fp = open(test_support.TESTFN, 'r') @@ -53,36 +47,25 @@ def test_touched(self): # This really only tests that nothing unforeseen happens. - import warnings - with warnings.catch_warnings(): - warnings.filterwarnings('ignore', 'macostools.touched*', - DeprecationWarning) + with test_support.check_warnings(('macostools.touched*', + DeprecationWarning), quiet=True): macostools.touched(test_support.TESTFN) if sys.maxint < 2**32: def test_copy(self): - try: - os.unlink(TESTFN2) - except: - pass + test_support.unlink(TESTFN2) macostools.copy(test_support.TESTFN, TESTFN2) self.assertEqual(self.compareData(), '') if sys.maxint < 2**32: def test_mkalias(self): - try: - os.unlink(TESTFN2) - except: - pass + test_support.unlink(TESTFN2) macostools.mkalias(test_support.TESTFN, TESTFN2) fss, _, _ = Carbon.File.ResolveAliasFile(TESTFN2, 0) self.assertEqual(fss.as_pathname(), os.path.realpath(test_support.TESTFN)) def test_mkalias_relative(self): - try: - os.unlink(TESTFN2) - except: - pass + test_support.unlink(TESTFN2) # If the directory doesn't exist, then chances are this is a new # install of Python so don't create it since the user might end up # running ``sudo make install`` and creating the directory here won't Modified: python/trunk/Lib/test/test_pep352.py ============================================================================== --- python/trunk/Lib/test/test_pep352.py (original) +++ python/trunk/Lib/test/test_pep352.py Thu Apr 1 00:01:03 2010 @@ -2,7 +2,7 @@ import __builtin__ import exceptions import warnings -from test.test_support import run_unittest +from test.test_support import run_unittest, check_warnings import os import sys from platform import system as platform_system @@ -15,14 +15,13 @@ "catching classes that don't inherit from BaseException is not allowed", "__get(item|slice)__ not supported for exception classes"]) +_deprecations = [(msg, DeprecationWarning) for msg in DEPRECATION_WARNINGS] + # Silence Py3k and other deprecation warnings def ignore_deprecation_warnings(func): """Ignore the known DeprecationWarnings.""" def wrapper(*args, **kw): - with warnings.catch_warnings(): - warnings.resetwarnings() - for text in DEPRECATION_WARNINGS: - warnings.filterwarnings("ignore", text, DeprecationWarning) + with check_warnings(*_deprecations, quiet=True): return func(*args, **kw) return wrapper @@ -139,16 +138,8 @@ def test_message_deprecation(self): # As of Python 2.6, BaseException.message is deprecated. - with warnings.catch_warnings(): - warnings.resetwarnings() - warnings.filterwarnings('error') - - try: - BaseException().message - except DeprecationWarning: - pass - else: - self.fail("BaseException.message not deprecated") + with check_warnings(("", DeprecationWarning)): + BaseException().message class UsageTests(unittest.TestCase): @@ -224,28 +215,19 @@ warnings.resetwarnings() warnings.filterwarnings("error") str_exc = "spam" - try: + with self.assertRaises(DeprecationWarning): try: raise StandardError except str_exc: pass - except DeprecationWarning: - pass - except StandardError: - self.fail("catching a string exception did not raise " - "DeprecationWarning") + # Make sure that even if the string exception is listed in a tuple # that a warning is raised. - try: + with self.assertRaises(DeprecationWarning): try: raise StandardError except (AssertionError, str_exc): pass - except DeprecationWarning: - pass - except StandardError: - self.fail("catching a string exception specified in a tuple did " - "not raise DeprecationWarning") def test_main(): Modified: python/trunk/Lib/test/test_re.py ============================================================================== --- python/trunk/Lib/test/test_re.py (original) +++ python/trunk/Lib/test/test_re.py Thu Apr 1 00:01:03 2010 @@ -1,4 +1,4 @@ -from test.test_support import verbose, run_unittest +from test.test_support import verbose, run_unittest, import_module import re from re import Scanner import sys, traceback @@ -447,11 +447,8 @@ import cPickle self.pickle_test(cPickle) # old pickles expect the _compile() reconstructor in sre module - import warnings - with warnings.catch_warnings(): - warnings.filterwarnings("ignore", "The sre module is deprecated", - DeprecationWarning) - from sre import _compile + import_module("sre", deprecated=True) + from sre import _compile def pickle_test(self, pickle): oldpat = re.compile('a(?:b|(c|e){1,2}?|d)+?(.)') Modified: python/trunk/Lib/test/test_sundry.py ============================================================================== --- python/trunk/Lib/test/test_sundry.py (original) +++ python/trunk/Lib/test/test_sundry.py Thu Apr 1 00:01:03 2010 @@ -3,13 +3,11 @@ from test import test_support import sys import unittest -import warnings class TestUntestedModules(unittest.TestCase): def test_at_least_import_untested_modules(self): - with warnings.catch_warnings(): - warnings.simplefilter("ignore") + with test_support.check_warnings(quiet=True): import CGIHTTPServer import audiodev import bdb Modified: python/trunk/Lib/test/test_symtable.py ============================================================================== --- python/trunk/Lib/test/test_symtable.py (original) +++ python/trunk/Lib/test/test_symtable.py Thu Apr 1 00:01:03 2010 @@ -3,7 +3,6 @@ """ import symtable import unittest -import warnings from test import test_support @@ -44,9 +43,8 @@ class SymtableTest(unittest.TestCase): - with warnings.catch_warnings(): - # Ignore warnings about "from blank import *" - warnings.simplefilter("ignore", SyntaxWarning) + with test_support.check_warnings( + ("import \* only allowed at module level", SyntaxWarning)): top = symtable.symtable(TEST_CODE, "?", "exec") # These correspond to scopes in TEST_CODE Mine = find_block(top, "Mine") Modified: python/trunk/Lib/test/test_urllibnet.py ============================================================================== --- python/trunk/Lib/test/test_urllibnet.py (original) +++ python/trunk/Lib/test/test_urllibnet.py Thu Apr 1 00:01:03 2010 @@ -182,10 +182,8 @@ def test_main(): test_support.requires('network') - from warnings import filterwarnings, catch_warnings - with catch_warnings(): - filterwarnings('ignore', '.*urllib\.urlopen.*Python 3.0', - DeprecationWarning) + with test_support.check_py3k_warnings( + ("urllib.urlopen.. has been removed", DeprecationWarning)): test_support.run_unittest(URLTimeoutTest, urlopenNetworkTests, urlretrieveNetworkTests) Modified: python/trunk/Lib/test/test_zipimport_support.py ============================================================================== --- python/trunk/Lib/test/test_zipimport_support.py (original) +++ python/trunk/Lib/test/test_zipimport_support.py Thu Apr 1 00:01:03 2010 @@ -168,12 +168,14 @@ test_zipped_doctest.test_unittest_reportflags, ] # Needed for test_DocTestParser and test_debug - with test.test_support.check_py3k_warnings( - ("backquote not supported", SyntaxWarning), - ("execfile.. not supported", DeprecationWarning)): + deprecations = [ # Ignore all warnings about the use of class Tester in this module. - warnings.filterwarnings("ignore", "class Tester is deprecated", - DeprecationWarning) + ("class Tester is deprecated", DeprecationWarning)] + if sys.py3kwarning: + deprecations += [ + ("backquote not supported", SyntaxWarning), + ("execfile.. not supported", DeprecationWarning)] + with test.test_support.check_warnings(*deprecations): for obj in known_good_tests: _run_object_doctest(obj, test_zipped_doctest)

1 0

Python Regression Test Failures opt (1)
by Neal Norwitz 31 Mar '10

31 Mar '10

347 tests OK. 1 test failed: test_pydoc 35 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_epoll test_gl test_imgfile test_ioctl test_kqueue test_linuxaudiodev test_macos test_macostools test_multiprocessing test_ossaudiodev test_py3kwarn test_scriptpackages test_smtpnet test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_tk test_ttk_guionly test_ttk_textonly test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound test_zipfile64 6 skips unexpected on linux2: test_epoll test_ioctl test_multiprocessing test_tk test_ttk_guionly test_ttk_textonly == CPython 2.7a4+ (trunk:79532M, Mar 31 2010, 16:01:34) [GCC 3.3.4 20040623 (Gentoo Linux 3.3.4-r1, ssp-3.3.2-2, pie-8.7.6)] == Linux-2.6.9-gentoo-r1-i686-AMD_Athlon-tm-_XP_3000+-with-gentoo-1.4.16 == /tmp/test_python_4239 test_grammar test_opcodes test_dict test_builtin test_exceptions test_types test_unittest test_doctest test_doctest2 test_MimeWriter test_SimpleHTTPServer test_StringIO test___all__ test___future__ test__locale test_abc test_abstract_numbers test_aepack test_aepack skipped -- No module named aetypes test_aifc test_al test_al skipped -- No module named al test_anydbm test_applesingle test_applesingle skipped -- No module named MacOS test_argparse test_array test_ascii_formatd test_ast test_asynchat test_asyncore test_atexit test_audioop test_augassign test_base64 test_bastion test_bigaddrspace test_bigmem test_binascii test_binhex test_binop test_bisect test_bool test_bsddb test_bsddb185 test_bsddb185 skipped -- No module named bsddb185 test_bsddb3 test_bsddb3 skipped -- Use of the `bsddb' resource not enabled test_buffer test_bufio test_bytes test_bz2 test_calendar test_call test_capi test_cd test_cd skipped -- No module named cd test_cfgparser test_cgi test_charmapcodec test_cl test_cl skipped -- No module named cl test_class test_cmath test_cmd test_cmd_line test_cmd_line_script test_code test_codeccallbacks test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecmaps_cn test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_codecs test_codeop test_coding test_coercion test_collections test_colorsys test_commands test_compare test_compile test_compileall test_compiler test_complex test_complex_args test_contains test_contextlib test_cookie test_cookielib test_copy test_copy_reg test_cpickle test_cprofile test_crypt test_csv test_ctypes test_curses test_curses skipped -- Use of the `curses' resource not enabled test_datetime test_dbm test_decimal test_decorators test_defaultdict test_deque test_descr test_descrtut test_dictcomps test_dictviews test_difflib test_dircache test_dis test_distutils [20619 refs] [20619 refs] [20619 refs] [20619 refs] [20616 refs] test_dl test_docxmlrpc test_dumbdbm test_dummy_thread test_dummy_threading test_email test_email_codecs test_email_renamed test_enumerate test_eof test_epoll test_epoll skipped -- kernel doesn't support epoll() test_errno test_exception_variations test_extcall test_fcntl test_file test_file2k test_filecmp test_fileinput test_fileio test_float test_fnmatch test_fork1 test_format test_fpformat test_fractions test_frozen test_ftplib test_funcattrs test_functools test_future test_future3 test_future4 test_future5 test_future_builtins test_gc test_gdbm test_generators test_genericpath test_genexps test_getargs test_getargs2 test_getopt test_gettext test_gl test_gl skipped -- No module named gl test_glob test_global test_grp test_gzip test_hash test_hashlib test_heapq test_hmac test_hotshot test_htmllib test_htmlparser test_httplib test_httpservers [16621 refs] [16621 refs] [16621 refs] [26875 refs] test_imageop test_imaplib test_imgfile test_imgfile skipped -- No module named imgfile test_imp test_import test_importhooks test_importlib test_index test_inspect test_int test_int_literal test_io test_ioctl test_ioctl skipped -- Unable to open /dev/tty test_isinstance test_iter test_iterlen test_itertools test_json test_kqueue test_kqueue skipped -- test works only on BSD test_largefile test_lib2to3 test_linecache test_linuxaudiodev test_linuxaudiodev skipped -- Use of the `audio' resource not enabled test_list test_locale test_logging test_long test_long_future test_longexp test_macos test_macos skipped -- No module named MacOS test_macostools test_macostools skipped -- No module named MacOS test_macpath test_mailbox test_marshal test_math test_md5 test_memoryio test_memoryview test_mhlib test_mimetools test_mimetypes test_minidom test_mmap test_module test_modulefinder test_multibytecodec test_multibytecodec_support test_multifile test_multiprocessing test_multiprocessing skipped -- This platform lacks a functioning sem_open implementation, therefore, the required synchronization primitives needed will not function, see issue 3770. test_mutants test_mutex test_netrc test_new test_nis test_normalization test_ntpath test_old_mailbox test_openpty test_operator test_optparse test_os [16621 refs] [16621 refs] test_ossaudiodev test_ossaudiodev skipped -- Use of the `audio' resource not enabled test_parser Expecting 's_push: parser stack overflow' in next line s_push: parser stack overflow test_pdb test_peepholer test_pep247 test_pep263 test_pep277 test_pep292 test_pep352 test_pickle test_pickletools test_pipes test_pkg test_pkgimport test_pkgutil test_platform [18017 refs] [18017 refs] test_plistlib test_poll test_popen [16626 refs] [16626 refs] [16626 refs] test_popen2 test_poplib test_posix test_posixpath test_pow test_pprint test_print test_profile test_profilehooks test_property test_pstats test_pty test_pwd test_py3kwarn test_py3kwarn skipped -- test.test_py3kwarn must be run with the -3 flag test_pyclbr test_pydoc [21735 refs] [21735 refs] [21735 refs] [21735 refs] [21735 refs] [21734 refs] [21734 refs] test test_pydoc failed -- Traceback (most recent call last): File "/tmp/python-test/local/lib/python2.7/test/test_pydoc.py", line 251, in test_issue8225 self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link") AssertionError: MODULE DOCS incorrectly includes a link Re-running test 'test_pydoc' in verbose mode test_badimport (test.test_pydoc.PyDocDocTest) ... [21735 refs] [21735 refs] [21735 refs] [21735 refs] [21735 refs] ok test_html_doc (test.test_pydoc.PyDocDocTest) ... ok test_input_strip (test.test_pydoc.PyDocDocTest) ... [21734 refs] ok test_issue8225 (test.test_pydoc.PyDocDocTest) ... FAIL test_not_here (test.test_pydoc.PyDocDocTest) ... [21734 refs] ok test_stripid (test.test_pydoc.PyDocDocTest) ... ok test_text_doc (test.test_pydoc.PyDocDocTest) ... ok test_class (test.test_pydoc.TestDescriptions) ... ok test_classic_class (test.test_pydoc.TestDescriptions) ... ok test_module (test.test_pydoc.TestDescriptions) ... ok ====================================================================== FAIL: test_issue8225 (test.test_pydoc.PyDocDocTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/tmp/python-test/local/lib/python2.7/test/test_pydoc.py", line 251, in test_issue8225 self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link") AssertionError: MODULE DOCS incorrectly includes a link ---------------------------------------------------------------------- Ran 10 tests in 1.653s FAILED (failures=1) test test_pydoc failed -- Traceback (most recent call last): File "/tmp/python-test/local/lib/python2.7/test/test_pydoc.py", line 251, in test_issue8225 self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link") AssertionError: MODULE DOCS incorrectly includes a link test_pyexpat test_queue test_quopri [19450 refs] [19450 refs] test_random test_re test_readline test_repr test_resource test_rfc822 test_richcmp test_robotparser test_runpy test_sax test_scope test_scriptpackages test_scriptpackages skipped -- No module named aetools test_select test_set test_setcomps test_sets test_sgmllib test_sha test_shelve test_shlex test_shutil test_signal test_site [16621 refs] [16621 refs] [16621 refs] [16621 refs] test_slice test_smtplib test_smtpnet test_smtpnet skipped -- Use of the `network' resource not enabled test_socket test_socketserver test_socketserver skipped -- Use of the `network' resource not enabled test_softspace test_sort test_sqlite test_ssl test_startfile test_startfile skipped -- module os has no attribute startfile test_str test_strftime test_string test_stringprep test_strop test_strptime test_strtod test_struct test_structmembers test_structseq test_subprocess [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16836 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] . [16621 refs] [16621 refs] this bit of output is from a test of stdout in a different process ... [16621 refs] [16621 refs] [16836 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16836 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] . [16621 refs] [16621 refs] this bit of output is from a test of stdout in a different process ... [16621 refs] [16621 refs] [16836 refs] test_sunaudiodev test_sunaudiodev skipped -- No module named sunaudiodev test_sundry test_symtable test_syntax test_sys [16621 refs] [16621 refs] [16621 refs] [16850 refs] [16644 refs] test_sysconfig [16621 refs] [16621 refs] test_tarfile test_tcl test_tcl skipped -- No module named _tkinter test_telnetlib test_tempfile [16621 refs] test_textwrap test_thread test_threaded_import test_threadedtempfile test_threading [19921 refs] [21092 refs] [20906 refs] [20906 refs] [20906 refs] [20906 refs] test_threading_local test_threadsignals test_time test_timeout test_timeout skipped -- Use of the `network' resource not enabled test_tk test_tk skipped -- No module named _tkinter test_tokenize test_trace test_traceback test_transformer test_ttk_guionly test_ttk_guionly skipped -- No module named _tkinter test_ttk_textonly test_ttk_textonly skipped -- No module named _tkinter test_tuple test_typechecks test_ucn test_unary test_undocumented_details test_unicode test_unicode_file test_unicode_file skipped -- No Unicode filesystem semantics on this platform. test_unicodedata test_univnewlines test_univnewlines2k test_unpack test_urllib test_urllib2 test_urllib2_localnet test_urllib2net test_urllib2net skipped -- Use of the `network' resource not enabled test_urllibnet test_urllibnet skipped -- Use of the `network' resource not enabled test_urlparse test_userdict test_userlist test_userstring test_uu test_uuid WARNING: uuid.getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. WARNING: uuid._ifconfig_getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. WARNING: uuid._unixdll_getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. test_wait3 test_wait4 test_warnings test_wave test_weakref test_weakset test_whichdb test_winreg test_winreg skipped -- No module named _winreg test_winsound test_winsound skipped -- No module named winsound test_with test_wsgiref test_xdrlib test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc test_xpickle test_xpickle -- skipping backwards compat tests. Use 'regrtest.py -u xpickle' to run them. test_xrange test_zipfile test_zipfile64 test_zipfile64 skipped -- test requires loads of disk-space bytes and a long time to run test_zipimport test_zipimport_support test_zlib 347 tests OK. 1 test failed: test_pydoc 35 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_epoll test_gl test_imgfile test_ioctl test_kqueue test_linuxaudiodev test_macos test_macostools test_multiprocessing test_ossaudiodev test_py3kwarn test_scriptpackages test_smtpnet test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_tk test_ttk_guionly test_ttk_textonly test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound test_zipfile64 6 skips unexpected on linux2: test_epoll test_ioctl test_multiprocessing test_tk test_ttk_guionly test_ttk_textonly [954728 refs]

1 0

r79538 - in python/branches/py3k: Lib/test/test_weakref.py
by antoine.pitrou 31 Mar '10

31 Mar '10

Author: antoine.pitrou Date: Wed Mar 31 23:40:47 2010 New Revision: 79538 Log: NOTE: only ported the test for new-style classes. Merged revisions 79535 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79535 | antoine.pitrou | 2010-03-31 23:32:15 +0200 (mer., 31 mars 2010) | 5 lines Issue #8268: Old-style classes (not just instances) now support weak references. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_weakref.py Modified: python/branches/py3k/Lib/test/test_weakref.py ============================================================================== --- python/branches/py3k/Lib/test/test_weakref.py (original) +++ python/branches/py3k/Lib/test/test_weakref.py Wed Mar 31 23:40:47 2010 @@ -680,6 +680,18 @@ # No exception should be raised here gc.collect() + def test_classes(self): + # Check that classes are weakrefable. + class A(object): + pass + l = [] + weakref.ref(int) + a = weakref.ref(A, l.append) + A = None + gc.collect() + self.assertEqual(a(), None) + self.assertEqual(l, [a]) + class SubclassableWeakrefTestCase(TestBase):

1 0

r79537 - python/trunk/Doc/whatsnew/2.7.rst
by florent.xicluna 31 Mar '10

31 Mar '10

Author: florent.xicluna Date: Wed Mar 31 23:40:32 2010 New Revision: 79537 Log: Fix typo Modified: python/trunk/Doc/whatsnew/2.7.rst Modified: python/trunk/Doc/whatsnew/2.7.rst ============================================================================== --- python/trunk/Doc/whatsnew/2.7.rst (original) +++ python/trunk/Doc/whatsnew/2.7.rst Wed Mar 31 23:40:32 2010 @@ -882,7 +882,7 @@ The :mod:`site` module now reports exceptions occurring when the :mod:`sitecustomize` module is imported, and will no longer - catch and swallow the :exc:`KeyboardError` exception. (Fixed by + catch and swallow the :exc:`KeyboardInterrupt` exception. (Fixed by Victor Stinner; :issue:`3137`.) * The :mod:`socket` module's :class:`SSL` objects now support the

1 0

r79536 - in python/branches/py3k: Lib/py_compile.py Misc/NEWS
by barry.warsaw 31 Mar '10

31 Mar '10

Author: barry.warsaw Date: Wed Mar 31 23:36:22 2010 New Revision: 79536 Log: - Issue #8233: When run as a script, py_compile.py optionally takes a single argument `-` which tells it to read files to compile from stdin. Each line is read on demand and the named file is compiled immediately. (Original patch by Piotr Ożarowski). Modified: python/branches/py3k/Lib/py_compile.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/py_compile.py ============================================================================== --- python/branches/py3k/Lib/py_compile.py (original) +++ python/branches/py3k/Lib/py_compile.py Wed Mar 31 23:36:22 2010 @@ -138,19 +138,35 @@ not specified) are compiled and the resulting bytecode is cached in the normal manner. This function does not search a directory structure to locate source files; it only compiles files named - explicitly. + explicitly. If '-' is the only parameter in args, the list of + files is taken from standard input. """ if args is None: args = sys.argv[1:] rv = 0 - for filename in args: - try: - compile(filename, doraise=True) - except PyCompileError as err: - # return value to indicate at least one failure - rv = 1 - sys.stderr.write(err.msg) + if args == ['-']: + while True: + filename = sys.stdin.readline() + if not filename: + break + filename = filename.rstrip('\n') + try: + compile(filename, doraise=True) + except PyCompileError as error: + rv = 1 + sys.stderr.write("%s\n" % error.msg) + except IOError as error: + rv = 1 + sys.stderr.write("%s\n" % error) + else: + for filename in args: + try: + compile(filename, doraise=True) + except PyCompileError as err: + # return value to indicate at least one failure + rv = 1 + sys.stderr.write(error.msg) return rv if __name__ == "__main__": Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Wed Mar 31 23:36:22 2010 @@ -293,6 +293,11 @@ Library ------- +- Issue #8233: When run as a script, py_compile.py optionally takes a single + argument `-` which tells it to read files to compile from stdin. Each line + is read on demand and the named file is compiled immediately. (Original + patch by Piotr Ożarowski). + - Backwards incompatible change: Unicode codepoints line tabulation (0x0B) and form feed (0x0C) are now considered linebreaks, as specified in Unicode Standard Annex #14. See issue #7643.

1 0

r79535 - in python/trunk: Include/classobject.h Lib/test/test_sys.py Lib/test/test_weakref.py Misc/NEWS Objects/classobject.c
by antoine.pitrou 31 Mar '10

31 Mar '10

Author: antoine.pitrou Date: Wed Mar 31 23:32:15 2010 New Revision: 79535 Log: Issue #8268: Old-style classes (not just instances) now support weak references. Modified: python/trunk/Include/classobject.h python/trunk/Lib/test/test_sys.py python/trunk/Lib/test/test_weakref.py python/trunk/Misc/NEWS python/trunk/Objects/classobject.c Modified: python/trunk/Include/classobject.h ============================================================================== --- python/trunk/Include/classobject.h (original) +++ python/trunk/Include/classobject.h Wed Mar 31 23:32:15 2010 @@ -18,6 +18,7 @@ PyObject *cl_getattr; PyObject *cl_setattr; PyObject *cl_delattr; + PyObject *cl_weakreflist; /* List of weak references */ } PyClassObject; typedef struct { Modified: python/trunk/Lib/test/test_sys.py ============================================================================== --- python/trunk/Lib/test/test_sys.py (original) +++ python/trunk/Lib/test/test_sys.py Wed Mar 31 23:32:15 2010 @@ -544,7 +544,7 @@ class class_oldstyle(): def method(): pass - check(class_oldstyle, size(h + '6P')) + check(class_oldstyle, size(h + '7P')) # instance (old-style class) check(class_oldstyle(), size(h + '3P')) # instancemethod (old-style class) Modified: python/trunk/Lib/test/test_weakref.py ============================================================================== --- python/trunk/Lib/test/test_weakref.py (original) +++ python/trunk/Lib/test/test_weakref.py Wed Mar 31 23:32:15 2010 @@ -685,6 +685,26 @@ # No exception should be raised here gc.collect() + def test_classes(self): + # Check that both old-style classes and new-style classes + # are weakrefable. + class A(object): + pass + class B: + pass + l = [] + weakref.ref(int) + a = weakref.ref(A, l.append) + A = None + gc.collect() + self.assertEqual(a(), None) + self.assertEqual(l, [a]) + b = weakref.ref(B, l.append) + B = None + gc.collect() + self.assertEqual(b(), None) + self.assertEqual(l, [a, b]) + class SubclassableWeakrefTestCase(TestBase): Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Wed Mar 31 23:32:15 2010 @@ -12,6 +12,9 @@ Core and Builtins ----------------- +- Issue #8268: Old-style classes (not just instances) now support weak + references. + - Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, compiler optimizations are disabled when --with-pydebug is used. Modified: python/trunk/Objects/classobject.c ============================================================================== --- python/trunk/Objects/classobject.c (original) +++ python/trunk/Objects/classobject.c Wed Mar 31 23:32:15 2010 @@ -123,6 +123,7 @@ op->cl_dict = dict; Py_XINCREF(name); op->cl_name = name; + op->cl_weakreflist = NULL; op->cl_getattr = class_lookup(op, getattrstr, &dummy); op->cl_setattr = class_lookup(op, setattrstr, &dummy); @@ -188,6 +189,8 @@ class_dealloc(PyClassObject *op) { _PyObject_GC_UNTRACK(op); + if (op->cl_weakreflist != NULL) + PyObject_ClearWeakRefs((PyObject *) op); Py_DECREF(op->cl_bases); Py_DECREF(op->cl_dict); Py_XDECREF(op->cl_name); @@ -454,7 +457,7 @@ (traverseproc)class_traverse, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ + offsetof(PyClassObject, cl_weakreflist), /* tp_weaklistoffset */ 0, /* tp_iter */ 0, /* tp_iternext */ 0, /* tp_methods */

1 0

Python Regression Test Failures basics (1)
by Neal Norwitz 31 Mar '10

31 Mar '10

347 tests OK. 1 test failed: test_pydoc 35 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_epoll test_gl test_imgfile test_ioctl test_kqueue test_linuxaudiodev test_macos test_macostools test_multiprocessing test_ossaudiodev test_py3kwarn test_scriptpackages test_smtpnet test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_tk test_ttk_guionly test_ttk_textonly test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound test_zipfile64 6 skips unexpected on linux2: test_epoll test_ioctl test_multiprocessing test_tk test_ttk_guionly test_ttk_textonly == CPython 2.7a4+ (trunk:79532M, Mar 31 2010, 16:01:34) [GCC 3.3.4 20040623 (Gentoo Linux 3.3.4-r1, ssp-3.3.2-2, pie-8.7.6)] == Linux-2.6.9-gentoo-r1-i686-AMD_Athlon-tm-_XP_3000+-with-gentoo-1.4.16 == /tmp/test_python_16499 test_grammar test_opcodes test_dict test_builtin test_exceptions test_types test_unittest test_doctest test_doctest2 test_MimeWriter test_SimpleHTTPServer test_StringIO test___all__ test___future__ test__locale test_abc test_abstract_numbers test_aepack test_aepack skipped -- No module named aetypes test_aifc test_al test_al skipped -- No module named al test_anydbm test_applesingle test_applesingle skipped -- No module named MacOS test_argparse test_array test_ascii_formatd test_ast test_asynchat test_asyncore test_atexit test_audioop test_augassign test_base64 test_bastion test_bigaddrspace test_bigmem test_binascii test_binhex test_binop test_bisect test_bool test_bsddb test_bsddb185 test_bsddb185 skipped -- No module named bsddb185 test_bsddb3 test_bsddb3 skipped -- Use of the `bsddb' resource not enabled test_buffer test_bufio test_bytes test_bz2 test_calendar test_call test_capi test_cd test_cd skipped -- No module named cd test_cfgparser test_cgi test_charmapcodec test_cl test_cl skipped -- No module named cl test_class test_cmath test_cmd test_cmd_line test_cmd_line_script test_code test_codeccallbacks test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecmaps_cn fetching http://source.icu-project.org/repos/icu/data/trunk/charset/data/xml/gb-1803… ... fetching http://people.freebsd.org/~perky/i18n/EUC-CN.TXT ... fetching http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP936.TXT ... test_codecmaps_hk fetching http://people.freebsd.org/~perky/i18n/BIG5HKSCS-2004.TXT ... test_codecmaps_jp fetching http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT ... fetching http://people.freebsd.org/~perky/i18n/EUC-JISX0213.TXT ... fetching http://people.freebsd.org/~perky/i18n/EUC-JP.TXT ... fetching http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/SHIFTJIS.TXT ... fetching http://people.freebsd.org/~perky/i18n/SHIFT_JISX0213.TXT ... test_codecmaps_kr fetching http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP949.TXT ... fetching http://people.freebsd.org/~perky/i18n/EUC-KR.TXT ... fetching http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC/JOHAB.TXT ... test_codecmaps_tw fetching http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/OTHER/BIG5.TXT ... fetching http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP950.TXT ... test_codecs test_codeop test_coding test_coercion test_collections test_colorsys test_commands test_compare test_compile test_compileall test_compiler test_complex test_complex_args test_contains test_contextlib test_cookie test_cookielib test_copy test_copy_reg test_cpickle test_cprofile test_crypt test_csv test_ctypes test_curses test_curses skipped -- Use of the `curses' resource not enabled test_datetime test_dbm test_decimal test_decorators test_defaultdict test_deque test_descr test_descrtut test_dictcomps test_dictviews test_difflib test_dircache test_dis test_distutils [20616 refs] test_dl test_docxmlrpc test_dumbdbm test_dummy_thread test_dummy_threading test_email test_email_codecs test_email_renamed test_enumerate test_eof test_epoll test_epoll skipped -- kernel doesn't support epoll() test_errno test_exception_variations test_extcall test_fcntl test_file test_file2k test_filecmp test_fileinput test_fileio test_float test_fnmatch test_fork1 test_format test_fpformat test_fractions test_frozen test_ftplib test_funcattrs test_functools test_future test_future3 test_future4 test_future5 test_future_builtins test_gc test_gdbm test_generators test_genericpath test_genexps test_getargs test_getargs2 test_getopt test_gettext test_gl test_gl skipped -- No module named gl test_glob test_global test_grp test_gzip test_hash test_hashlib test_heapq test_hmac test_hotshot test_htmllib test_htmlparser test_httplib test_httpservers [16621 refs] [16621 refs] [16621 refs] [26875 refs] test_imageop test_imaplib test_imgfile test_imgfile skipped -- No module named imgfile test_imp test_import test_importhooks test_importlib test_index test_inspect test_int test_int_literal test_io test_ioctl test_ioctl skipped -- Unable to open /dev/tty test_isinstance test_iter test_iterlen test_itertools test_json test_kqueue test_kqueue skipped -- test works only on BSD test_largefile test_lib2to3 test_linecache test_linuxaudiodev test_linuxaudiodev skipped -- Use of the `audio' resource not enabled test_list test_locale test_logging test_long test_long_future test_longexp test_macos test_macos skipped -- No module named MacOS test_macostools test_macostools skipped -- No module named MacOS test_macpath test_mailbox test_marshal test_math test_md5 test_memoryio test_memoryview test_mhlib test_mimetools test_mimetypes test_minidom test_mmap test_module test_modulefinder test_multibytecodec test_multibytecodec_support test_multifile test_multiprocessing test_multiprocessing skipped -- This platform lacks a functioning sem_open implementation, therefore, the required synchronization primitives needed will not function, see issue 3770. test_mutants test_mutex test_netrc test_new test_nis test_normalization fetching http://www.unicode.org/Public/5.2.0/ucd/NormalizationTest.txt ... test_ntpath test_old_mailbox test_openpty test_operator test_optparse test_os [16621 refs] [16621 refs] test_ossaudiodev test_ossaudiodev skipped -- Use of the `audio' resource not enabled test_parser Expecting 's_push: parser stack overflow' in next line s_push: parser stack overflow test_pdb test_peepholer test_pep247 test_pep263 test_pep277 test_pep292 test_pep352 test_pickle test_pickletools test_pipes test_pkg test_pkgimport test_pkgutil test_platform [18017 refs] [18017 refs] test_plistlib test_poll test_popen [16626 refs] [16626 refs] [16626 refs] test_popen2 test_poplib test_posix test_posixpath test_pow test_pprint test_print test_profile test_profilehooks test_property test_pstats test_pty test_pwd test_py3kwarn test_py3kwarn skipped -- test.test_py3kwarn must be run with the -3 flag test_pyclbr test_pydoc [21735 refs] [21735 refs] [21735 refs] [21735 refs] [21735 refs] [21734 refs] [21734 refs] test test_pydoc failed -- Traceback (most recent call last): File "/tmp/python-test/local/lib/python2.7/test/test_pydoc.py", line 251, in test_issue8225 self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link") AssertionError: MODULE DOCS incorrectly includes a link Re-running test 'test_pydoc' in verbose mode test_badimport (test.test_pydoc.PyDocDocTest) ... [21735 refs] [21735 refs] [21735 refs] [21735 refs] [21735 refs] ok test_html_doc (test.test_pydoc.PyDocDocTest) ... ok test_input_strip (test.test_pydoc.PyDocDocTest) ... [21734 refs] ok test_issue8225 (test.test_pydoc.PyDocDocTest) ... FAIL test_not_here (test.test_pydoc.PyDocDocTest) ... [21734 refs] ok test_stripid (test.test_pydoc.PyDocDocTest) ... ok test_text_doc (test.test_pydoc.PyDocDocTest) ... ok test_class (test.test_pydoc.TestDescriptions) ... ok test_classic_class (test.test_pydoc.TestDescriptions) ... ok test_module (test.test_pydoc.TestDescriptions) ... ok ====================================================================== FAIL: test_issue8225 (test.test_pydoc.PyDocDocTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/tmp/python-test/local/lib/python2.7/test/test_pydoc.py", line 251, in test_issue8225 self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link") AssertionError: MODULE DOCS incorrectly includes a link ---------------------------------------------------------------------- Ran 10 tests in 1.613s FAILED (failures=1) test test_pydoc failed -- Traceback (most recent call last): File "/tmp/python-test/local/lib/python2.7/test/test_pydoc.py", line 251, in test_issue8225 self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link") AssertionError: MODULE DOCS incorrectly includes a link test_pyexpat test_queue test_quopri [19450 refs] [19450 refs] test_random test_re test_readline test_repr test_resource test_rfc822 test_richcmp test_robotparser test_runpy test_sax test_scope test_scriptpackages test_scriptpackages skipped -- No module named aetools test_select test_set test_setcomps test_sets test_sgmllib test_sha test_shelve test_shlex test_shutil test_signal test_site [16621 refs] [16621 refs] [16621 refs] [16621 refs] test_slice test_smtplib test_smtpnet test_smtpnet skipped -- Use of the `network' resource not enabled test_socket test_socketserver test_socketserver skipped -- Use of the `network' resource not enabled test_softspace test_sort test_sqlite test_ssl test_startfile test_startfile skipped -- module os has no attribute startfile test_str test_strftime test_string test_stringprep test_strop test_strptime test_strtod test_struct test_structmembers test_structseq test_subprocess [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16836 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] . [16621 refs] [16621 refs] this bit of output is from a test of stdout in a different process ... [16621 refs] [16621 refs] [16836 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16836 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] [16621 refs] . [16621 refs] [16621 refs] this bit of output is from a test of stdout in a different process ... [16621 refs] [16621 refs] [16836 refs] test_sunaudiodev test_sunaudiodev skipped -- No module named sunaudiodev test_sundry test_symtable test_syntax test_sys [16621 refs] [16621 refs] [16621 refs] [16850 refs] [16644 refs] test_sysconfig [16621 refs] [16621 refs] test_tarfile test_tcl test_tcl skipped -- No module named _tkinter test_telnetlib test_tempfile [16621 refs] test_textwrap test_thread test_threaded_import test_threadedtempfile test_threading [19921 refs] [21994 refs] [20906 refs] [20906 refs] [20906 refs] [20906 refs] test_threading_local test_threadsignals test_time test_timeout test_timeout skipped -- Use of the `network' resource not enabled test_tk test_tk skipped -- No module named _tkinter test_tokenize test_trace test_traceback test_transformer test_ttk_guionly test_ttk_guionly skipped -- No module named _tkinter test_ttk_textonly test_ttk_textonly skipped -- No module named _tkinter test_tuple test_typechecks test_ucn test_unary test_undocumented_details test_unicode test_unicode_file test_unicode_file skipped -- No Unicode filesystem semantics on this platform. test_unicodedata test_univnewlines test_univnewlines2k test_unpack test_urllib test_urllib2 test_urllib2_localnet test_urllib2net test_urllib2net skipped -- Use of the `network' resource not enabled test_urllibnet test_urllibnet skipped -- Use of the `network' resource not enabled test_urlparse test_userdict test_userlist test_userstring test_uu test_uuid WARNING: uuid.getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. WARNING: uuid._ifconfig_getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. WARNING: uuid._unixdll_getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. test_wait3 test_wait4 test_warnings test_wave test_weakref test_weakset test_whichdb test_winreg test_winreg skipped -- No module named _winreg test_winsound test_winsound skipped -- No module named winsound test_with test_wsgiref test_xdrlib test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc test_xpickle test_xpickle -- skipping backwards compat tests. Use 'regrtest.py -u xpickle' to run them. test_xrange test_zipfile test_zipfile64 test_zipfile64 skipped -- test requires loads of disk-space bytes and a long time to run test_zipimport test_zipimport_support test_zlib 347 tests OK. 1 test failed: test_pydoc 35 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_epoll test_gl test_imgfile test_ioctl test_kqueue test_linuxaudiodev test_macos test_macostools test_multiprocessing test_ossaudiodev test_py3kwarn test_scriptpackages test_smtpnet test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_tk test_ttk_guionly test_ttk_textonly test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound test_zipfile64 6 skips unexpected on linux2: test_epoll test_ioctl test_multiprocessing test_tk test_ttk_guionly test_ttk_textonly [955876 refs]

1 0