Mailman 3 September 2008 - Python-checkins

buildbot failure in x86 W2k8 3.0
by buildbot＠python.org 29 Sep '08

29 Sep '08

The Buildbot has detected a new failure of x86 W2k8 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20W2k8%203.0/builds/291 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: nelson-windows Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: brett.cannon BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_ssl sincerely, -The Buildbot

1 0

buildbot failure in amd64 gentoo 2.5
by buildbot＠python.org 29 Sep '08

29 Sep '08

The Buildbot has detected a new failure of amd64 gentoo 2.5. Full details are available at: http://www.python.org/dev/buildbot/all/amd64%20gentoo%202.5/builds/151 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: norwitz-amd64 Build Reason: Build Source Stamp: [branch branches/release25-maint] HEAD Blamelist: brett.cannon BUILD FAILED: failed test Excerpt from the test logfile: Traceback (most recent call last): File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/threading.py", line 486, in __bootstrap_inner self.run() File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/threading.py", line 446, in run self.__target(*self.__args, **self.__kwargs) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/bsddb/test/test_thread.py", line 281, in readerThread rec = dbutils.DeadlockWrap(c.next, max_retries=10) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/bsddb/dbutils.py", line 62, in DeadlockWrap return function(*_args, **_kwargs) DBLockDeadlockError: (-30995, 'DB_LOCK_DEADLOCK: Locker killed to resolve a deadlock') 1 test failed: test_urllib2net ====================================================================== ERROR: testURLread (test.test_urllib2net.URLTimeoutTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/test/test_urllib2net.py", line 24, in testURLread f = urllib2.urlopen("http://www.python.org/") File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 381, in open response = self._open(req, data) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 399, in _open '_open', req) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 360, in _call_chain result = func(*args) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 1107, in http_open return self.do_open(httplib.HTTPConnection, req) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 1082, in do_open raise URLError(err) URLError: <urlopen error (111, 'Connection refused')> ====================================================================== ERROR: test_basic (test.test_urllib2net.urlopenNetworkTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/test/test_urllib2net.py", line 105, in test_basic open_url = urllib2.urlopen("http://www.python.org/") File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 124, in urlopen return _opener.open(url, data) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 381, in open response = self._open(req, data) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 399, in _open '_open', req) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 360, in _call_chain result = func(*args) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 1107, in http_open return self.do_open(httplib.HTTPConnection, req) File "/home/buildbot/slave/py-build/2.5.norwitz-amd64/build/Lib/urllib2.py", line 1082, in do_open raise URLError(err) URLError: <urlopen error (111, 'Connection refused')> make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

Python Regression Test Failures all (1)
by Neal Norwitz 29 Sep '08

29 Sep '08

330 tests OK. 1 test failed: test_urllibnet 26 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_cd test_cl test_epoll test_gl test_imageop test_imgfile test_ioctl test_kqueue test_lib2to3 test_macos test_macostools test_multiprocessing test_pep277 test_py3kwarn test_scriptpackages test_startfile test_sunaudiodev test_tcl test_unicode_file test_winreg test_winsound test_zipfile64 4 skips unexpected on linux2: test_epoll test_multiprocessing test_lib2to3 test_ioctl 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 aepack test_al test_al skipped -- No module named al test_anydbm test_applesingle test_applesingle skipped -- No module named macostools test_array 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 Sleepycat Software: Berkeley DB 4.1.25: (December 19, 2002) Test path prefix: /tmp/z-test_bsddb3-14798 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_compiler testCompileLibrary still working, be patient... testCompileLibrary still working, be patient... testCompileLibrary still working, be patient... testCompileLibrary still working, be patient... testCompileLibrary still working, be patient... testCompileLibrary still working, be patient... testCompileLibrary still working, be patient... testCompileLibrary still working, be patient... testCompileLibrary still working, be patient... 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_datetime test_dbm test_decimal test_decorators test_defaultdict test_deque test_descr test_descrtut test_difflib test_dircache test_dis test_distutils 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_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_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 [12826 refs] [12826 refs] [21355 refs] test_imageop test_imageop skipped -- No module named imgfile test_imaplib test_imgfile test_imgfile skipped -- No module named imgfile test_imp test_import test_importhooks 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_lib2to3 skipped -- No module named myfixes 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 macostools test_macpath test_mailbox test_marshal test_math test_md5 test_memoryio 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 -- OSError raises on RLock creation, see issue 3111! 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 /tmp/python-test/local/lib/python2.6/os.py:759: DeprecationWarning: integer argument expected, got float bs += read(_urandomfd, n - len(bs)) test_parser Expecting 's_push: parser stack overflow' in next line s_push: parser stack overflow test_peepholer test_pep247 test_pep263 test_pep277 test_pep277 skipped -- test works only on NT+ test_pep292 test_pep352 test_pickle test_pickletools test_pipes test_pkg test_pkgimport test_pkgutil test_platform test_plistlib test_poll test_popen [12831 refs] [12831 refs] [12831 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 [17360 refs] test_pyexpat test_queue test_quopri [15345 refs] [15345 refs] test_random test_re 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_sets test_sgmllib test_sha test_shelve test_shlex test_shutil test_signal test_site [12826 refs] [12826 refs] [12829 refs] [12826 refs] test_slice test_smtplib test_socket test_socketserver test_softspace test_sort test_sqlite test_ssl test_startfile test_startfile skipped -- cannot import name startfile test_str test_strftime test_string test_stringprep test_strop test_strptime test_struct test_structmembers test_structseq test_subprocess [12826 refs] [12826 refs] [12826 refs] [12826 refs] [12826 refs] [12826 refs] [12826 refs] [12826 refs] [12826 refs] [12826 refs] [12826 refs] [12826 refs] [14726 refs] [13041 refs] [12826 refs] [12826 refs] [12826 refs] [12826 refs] [12826 refs] [12826 refs] . [12826 refs] [12826 refs] this bit of output is from a test of stdout in a different process ... [12826 refs] [12826 refs] [13041 refs] test_sunaudiodev test_sunaudiodev skipped -- No module named sunaudiodev test_sundry /tmp/python-test/local/lib/python2.6/test/test_sundry.py:67: DeprecationWarning: The posixfile module is deprecated; fcntl.lockf() provides better locking import posixfile test_symtable test_syntax test_sys [12826 refs] [12826 refs] [13055 refs] [12849 refs] test_tarfile test_tcl test_tcl skipped -- No module named _tkinter test_telnetlib test_tempfile [12829 refs] test_textwrap test_thread test_threaded_import test_threadedtempfile test_threading [16318 refs] [16812 refs] [15783 refs] [15783 refs] [15783 refs] [15783 refs] test_threading_local test_threadsignals test_time test_timeout test_tokenize test_trace test_traceback test_transformer 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_unpack test_urllib test_urllib2 test_urllib2_localnet test_urllib2net test_urllibnet test test_urllibnet failed -- Traceback (most recent call last): File "/tmp/python-test/local/lib/python2.6/test/test_urllibnet.py", line 38, in testURLread x = f.read() File "/tmp/python-test/local/lib/python2.6/socket.py", line 327, in read data = self._sock.recv(rbufsize) timeout: timed out 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_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_xrange test_zipfile test_zipfile64 test_zipfile64 skipped -- test requires loads of disk-space bytes and a long time to run test_zipimport test_zlib 330 tests OK. 1 test failed: test_urllibnet 26 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_cd test_cl test_epoll test_gl test_imageop test_imgfile test_ioctl test_kqueue test_lib2to3 test_macos test_macostools test_multiprocessing test_pep277 test_py3kwarn test_scriptpackages test_startfile test_sunaudiodev test_tcl test_unicode_file test_winreg test_winsound test_zipfile64 4 skips unexpected on linux2: test_epoll test_multiprocessing test_lib2to3 test_ioctl [662377 refs]

1 0

r66678 - in python/branches/release25-maint: Lib/test/test_cProfile.py Misc/NEWS Modules/_lsprof.c
by brett.cannon 28 Sep '08

28 Sep '08

Author: brett.cannon Date: Mon Sep 29 05:57:24 2008 New Revision: 66678 Log: Backport of r66677: _lsprof crasher when a bad external timer is used during garbage collection of a Profiler object. Modified: python/branches/release25-maint/Lib/test/test_cProfile.py python/branches/release25-maint/Misc/NEWS python/branches/release25-maint/Modules/_lsprof.c Modified: python/branches/release25-maint/Lib/test/test_cProfile.py ============================================================================== --- python/branches/release25-maint/Lib/test/test_cProfile.py (original) +++ python/branches/release25-maint/Lib/test/test_cProfile.py Mon Sep 29 05:57:24 2008 @@ -1,6 +1,5 @@ """Test suite for the cProfile module.""" - -import cProfile, pstats, sys +import cProfile, pstats, sys, test.test_support # In order to have reproducible time, we simulate a timer in the global # variable 'ticks', which represents simulated time in milliseconds. @@ -23,6 +22,7 @@ st.strip_dirs().sort_stats('stdname').print_stats() st.print_callees() st.print_callers() + test_bad_counter_during_dealloc() def timer(): return ticks @@ -119,5 +119,20 @@ ticks += 1 raise AttributeError +# Issue 3895. +def test_bad_counter_during_dealloc(): + import _lsprof + # Must use a file as StringIO doesn't trigger the bug. + sys.stderr = open(test.test_support.TESTFN, 'w') + try: + obj = _lsprof.Profiler(lambda: int) + obj.enable() + obj = _lsprof.Profiler(1) + obj.disable() + finally: + sys.stderr = sys.__stderr__ + test.test_support.unlink(test.test_support.TESTFN) + + if __name__ == "__main__": test_main() Modified: python/branches/release25-maint/Misc/NEWS ============================================================================== --- python/branches/release25-maint/Misc/NEWS (original) +++ python/branches/release25-maint/Misc/NEWS Mon Sep 29 05:57:24 2008 @@ -92,6 +92,9 @@ Library ------- +- Issue #3895: _lsprof could be crashed with an external timer that did not + return a float when a Profiler object is garbage collected. + - Issues #3968 and #3969: two minor turtle problems. - Issue #3547: Fixed ctypes structures bitfields of varying integer Modified: python/branches/release25-maint/Modules/_lsprof.c ============================================================================== --- python/branches/release25-maint/Modules/_lsprof.c (original) +++ python/branches/release25-maint/Modules/_lsprof.c Mon Sep 29 05:57:24 2008 @@ -150,7 +150,16 @@ } Py_DECREF(o); if (PyErr_Occurred()) { - PyErr_WriteUnraisable((PyObject *) pObj); + PyObject *context = (PyObject *)pObj; + /* May have been called by profiler_dealloc(). */ + if (context->ob_refcnt < 1) { + context = PyString_FromString("profiler calling an " + "external timer"); + if (context == NULL) { + return 0; + } + } + PyErr_WriteUnraisable(context); return 0; } return result;

1 0

buildbot failure in x86 W2k8 trunk
by buildbot＠python.org 28 Sep '08

28 Sep '08

The Buildbot has detected a new failure of x86 W2k8 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20W2k8%20trunk/builds/212 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: nelson-windows Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: brett.cannon BUILD FAILED: failed failed slave lost sincerely, -The Buildbot

1 0

r66677 - in python/trunk: Lib/test/test_cprofile.py Misc/NEWS Modules/_lsprof.c
by brett.cannon 28 Sep '08

28 Sep '08

Author: brett.cannon Date: Mon Sep 29 05:41:21 2008 New Revision: 66677 Log: The _lsprof module could crash the interpreter if it was given an external timer that did not return a float and a timer was still running when the Profiler object was garbage collected. Fixes issue 3895. Code review by Benjamin Peterson. Modified: python/trunk/Lib/test/test_cprofile.py python/trunk/Misc/NEWS python/trunk/Modules/_lsprof.c Modified: python/trunk/Lib/test/test_cprofile.py ============================================================================== --- python/trunk/Lib/test/test_cprofile.py (original) +++ python/trunk/Lib/test/test_cprofile.py Mon Sep 29 05:41:21 2008 @@ -1,7 +1,7 @@ """Test suite for the cProfile module.""" import sys -from test.test_support import run_unittest +from test.test_support import run_unittest, TESTFN, unlink # rip off all interesting stuff from test_profile import cProfile @@ -10,6 +10,20 @@ class CProfileTest(ProfileTest): profilerclass = cProfile.Profile + # Issue 3895. + def test_bad_counter_during_dealloc(self): + import _lsprof + # Must use a file as StringIO doesn't trigger the bug. + sys.stderr = open(TESTFN, 'w') + try: + obj = _lsprof.Profiler(lambda: int) + obj.enable() + obj = _lsprof.Profiler(1) + obj.disable() + finally: + sys.stderr = sys.__stderr__ + unlink(TESTFN) + def test_main(): run_unittest(CProfileTest) Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Mon Sep 29 05:41:21 2008 @@ -23,6 +23,10 @@ Library ------- +- Issue #3895: It was possible to crash the interpreter when an external timer + was used with cProfile that returned an object that could not be converted + into a float. + - Issue #3950: Made turtle respect scale factors. - Issue #3547: Fixed ctypes structures bitfields of varying integer Modified: python/trunk/Modules/_lsprof.c ============================================================================== --- python/trunk/Modules/_lsprof.c (original) +++ python/trunk/Modules/_lsprof.c Mon Sep 29 05:41:21 2008 @@ -150,7 +150,16 @@ } Py_DECREF(o); if (PyErr_Occurred()) { - PyErr_WriteUnraisable((PyObject *) pObj); + PyObject *context = (PyObject *)pObj; + /* May have been called by profiler_dealloc(). */ + if (Py_REFCNT(context) < 1) { + context = PyString_FromString("profiler calling an " + "external timer"); + if (context == NULL) { + return 0; + } + } + PyErr_WriteUnraisable(context); return 0; } return result;

1 0

r66568 - in python/trunk: Lib/bsddb/test/test_basics.py Modules/_bsddb.c Modules/bsddb.h
by jesus.cea 28 Sep '08

28 Sep '08

Author: jesus.cea Date: Tue Sep 23 20:54:08 2008 New Revision: 66568 Log: Bugfix for issue3885 and 'DB.verify()' crash Modified: python/trunk/Lib/bsddb/test/test_basics.py python/trunk/Modules/_bsddb.c python/trunk/Modules/bsddb.h Modified: python/trunk/Lib/bsddb/test/test_basics.py ============================================================================== --- python/trunk/Lib/bsddb/test/test_basics.py (original) +++ python/trunk/Lib/bsddb/test/test_basics.py Tue Sep 23 20:54:08 2008 @@ -573,6 +573,15 @@ #---------------------------------------- + def test07_verify(self): + # Verify bug solved in 4.7.3pre8 + self.d.close() + d = db.DB(self.env) + d.verify(self.filename) + + + #---------------------------------------- + #---------------------------------------------------------------------- @@ -602,13 +611,13 @@ #---------------------------------------- - def test07_EnvRemoveAndRename(self): + def test08_EnvRemoveAndRename(self): if not self.env: return if verbose: print '\n', '-=' * 30 - print "Running %s.test07_EnvRemoveAndRename..." % self.__class__.__name__ + print "Running %s.test08_EnvRemoveAndRename..." % self.__class__.__name__ # can't rename or remove an open DB self.d.close() @@ -619,7 +628,7 @@ # dbremove and dbrename are in 4.1 and later if db.version() < (4,1): - del test07_EnvRemoveAndRename + del test08_EnvRemoveAndRename #---------------------------------------- @@ -720,11 +729,11 @@ #---------------------------------------- - def test07_TxnTruncate(self): + def test08_TxnTruncate(self): d = self.d if verbose: print '\n', '-=' * 30 - print "Running %s.test07_TxnTruncate..." % self.__class__.__name__ + print "Running %s.test08_TxnTruncate..." % self.__class__.__name__ d.put("abcde", "ABCDE"); txn = self.env.txn_begin() @@ -737,7 +746,7 @@ #---------------------------------------- - def test08_TxnLateUse(self): + def test09_TxnLateUse(self): txn = self.env.txn_begin() txn.abort() try: @@ -771,11 +780,11 @@ dbtype = db.DB_BTREE dbsetflags = db.DB_RECNUM - def test07_RecnoInBTree(self): + def test08_RecnoInBTree(self): d = self.d if verbose: print '\n', '-=' * 30 - print "Running %s.test07_RecnoInBTree..." % self.__class__.__name__ + print "Running %s.test08_RecnoInBTree..." % self.__class__.__name__ rec = d.get(200) self.assertEqual(type(rec), type(())) @@ -805,11 +814,11 @@ class BasicDUPTestCase(BasicTestCase): dbsetflags = db.DB_DUP - def test08_DuplicateKeys(self): + def test09_DuplicateKeys(self): d = self.d if verbose: print '\n', '-=' * 30 - print "Running %s.test08_DuplicateKeys..." % \ + print "Running %s.test09_DuplicateKeys..." % \ self.__class__.__name__ d.put("dup0", "before") @@ -878,11 +887,11 @@ else: return db.DB_BTREE - def test09_MultiDB(self): + def test10_MultiDB(self): d1 = self.d if verbose: print '\n', '-=' * 30 - print "Running %s.test09_MultiDB..." % self.__class__.__name__ + print "Running %s.test10_MultiDB..." % self.__class__.__name__ d2 = db.DB(self.env) d2.open(self.filename, "second", self.dbtype, @@ -1014,9 +1023,20 @@ self.obj = db.DB() class CrashAndBurn(unittest.TestCase) : - def test01_OpenCrash(self) : - # See http://bugs.python.org/issue3307 - self.assertRaises(db.DBInvalidArgError, db.DB, None, 65535) + import sys + if sys.version_info[:3] < (2, 4, 0): + def assertTrue(self, expr, msg=None): + self.failUnless(expr,msg=msg) + + #def test01_OpenCrash(self) : + # # See http://bugs.python.org/issue3307 + # self.assertRaises(db.DBInvalidArgError, db.DB, None, 65535) + + def test02_DBEnv_dealloc(self): + # http://bugs.python.org/issue3885 + import gc + self.assertRaises(db.DBInvalidArgError, db.DBEnv, ~db.DB_RPCCLIENT) + gc.collect() #---------------------------------------------------------------------- @@ -1044,7 +1064,7 @@ suite.addTest(unittest.makeSuite(HashMultiDBTestCase)) suite.addTest(unittest.makeSuite(DBEnvPrivateObject)) suite.addTest(unittest.makeSuite(DBPrivateObject)) - #suite.addTest(unittest.makeSuite(CrashAndBurn)) + suite.addTest(unittest.makeSuite(CrashAndBurn)) return suite Modified: python/trunk/Modules/_bsddb.c ============================================================================== --- python/trunk/Modules/_bsddb.c (original) +++ python/trunk/Modules/_bsddb.c Tue Sep 23 20:54:08 2008 @@ -989,7 +989,7 @@ /* Forward declaration */ -static PyObject *DB_close_internal(DBObject* self, int flags); +static PyObject *DB_close_internal(DBObject* self, int flags, int do_not_close); static void DB_dealloc(DBObject* self) @@ -997,8 +997,15 @@ PyObject *dummy; if (self->db != NULL) { - dummy=DB_close_internal(self,0); - Py_XDECREF(dummy); + dummy=DB_close_internal(self, 0, 0); + /* + ** Raising exceptions while doing + ** garbage collection is a fatal error. + */ + if (dummy) + Py_DECREF(dummy); + else + PyErr_Clear(); } if (self->in_weakreflist != NULL) { PyObject_ClearWeakRefs((PyObject *) self); @@ -1052,8 +1059,15 @@ PyObject *dummy; if (self->dbc != NULL) { - dummy=DBC_close_internal(self); - Py_XDECREF(dummy); + dummy=DBC_close_internal(self); + /* + ** Raising exceptions while doing + ** garbage collection is a fatal error. + */ + if (dummy) + Py_DECREF(dummy); + else + PyErr_Clear(); } if (self->in_weakreflist != NULL) { PyObject_ClearWeakRefs((PyObject *) self); @@ -1071,6 +1085,7 @@ if (self == NULL) return NULL; + self->db_env = NULL; self->closed = 1; self->flags = flags; self->moduleFlags.getReturnsNone = DEFAULT_GET_RETURNS_NONE; @@ -1107,8 +1122,15 @@ PyObject *dummy; if (self->db_env) { - dummy=DBEnv_close_internal(self,0); - Py_XDECREF(dummy); + dummy=DBEnv_close_internal(self, 0); + /* + ** Raising exceptions while doing + ** garbage collection is a fatal error. + */ + if (dummy) + Py_DECREF(dummy); + else + PyErr_Clear(); } Py_XDECREF(self->event_notifyCallback); @@ -1186,8 +1208,17 @@ if (self->txn) { int flag_prepare = self->flag_prepare; + dummy=DBTxn_abort_discard_internal(self,0); - Py_XDECREF(dummy); + /* + ** Raising exceptions while doing + ** garbage collection is a fatal error. + */ + if (dummy) + Py_DECREF(dummy); + else + PyErr_Clear(); + if (!flag_prepare) { PyErr_Warn(PyExc_RuntimeWarning, "DBTxn aborted in destructor. No prior commit() or abort()."); @@ -1280,7 +1311,14 @@ if (self->sequence != NULL) { dummy=DBSequence_close_internal(self,0,0); - Py_XDECREF(dummy); + /* + ** Raising exceptions while doing + ** garbage collection is a fatal error. + */ + if (dummy) + Py_DECREF(dummy); + else + PyErr_Clear(); } if (self->in_weakreflist != NULL) { @@ -1485,10 +1523,10 @@ static PyObject* -DB_close_internal(DBObject* self, int flags) +DB_close_internal(DBObject* self, int flags, int do_not_close) { PyObject *dummy; - int err; + int err = 0; if (self->db != NULL) { /* Can be NULL if db is not in an environment */ @@ -1511,10 +1549,20 @@ } #endif - MYDB_BEGIN_ALLOW_THREADS; - err = self->db->close(self->db, flags); - MYDB_END_ALLOW_THREADS; - self->db = NULL; + /* + ** "do_not_close" is used to dispose all related objects in the + ** tree, without actually releasing the "root" object. + ** This is done, for example, because function calls like + ** "DB.verify()" implicitly close the underlying handle. So + ** the handle doesn't need to be closed, but related objects + ** must be cleaned up. + */ + if (!do_not_close) { + MYDB_BEGIN_ALLOW_THREADS; + err = self->db->close(self->db, flags); + MYDB_END_ALLOW_THREADS; + self->db = NULL; + } RETURN_IF_ERR(); } RETURN_NONE(); @@ -1526,7 +1574,7 @@ int flags=0; if (!PyArg_ParseTuple(args,"|i:close", &flags)) return NULL; - return DB_close_internal(self,flags); + return DB_close_internal(self, flags, 0); } @@ -2146,7 +2194,7 @@ if (makeDBError(err)) { PyObject *dummy; - dummy=DB_close_internal(self,0); + dummy=DB_close_internal(self, 0, 0); Py_XDECREF(dummy); return NULL; } @@ -2840,21 +2888,24 @@ /* XXX(nnorwitz): it should probably be an exception if outFile can't be opened. */ - MYDB_BEGIN_ALLOW_THREADS; - err = self->db->verify(self->db, fileName, dbName, outFile, flags); - MYDB_END_ALLOW_THREADS; - if (outFile) - fclose(outFile); - { /* DB.verify acts as a DB handle destructor (like close) */ PyObject *error; - error=DB_close_internal(self,0); + error=DB_close_internal(self, 0, 1); if (error ) { return error; } } + MYDB_BEGIN_ALLOW_THREADS; + err = self->db->verify(self->db, fileName, dbName, outFile, flags); + MYDB_END_ALLOW_THREADS; + + self->db = NULL; /* Implicit close; related objects already released */ + + if (outFile) + fclose(outFile); + RETURN_IF_ERR(); RETURN_NONE(); } @@ -3978,7 +4029,7 @@ Py_XDECREF(dummy); } while(self->children_dbs) { - dummy=DB_close_internal(self->children_dbs,0); + dummy=DB_close_internal(self->children_dbs, 0, 0); Py_XDECREF(dummy); } } @@ -4003,7 +4054,7 @@ if (!PyArg_ParseTuple(args, "|i:close", &flags)) return NULL; - return DBEnv_close_internal(self,flags); + return DBEnv_close_internal(self, flags); } @@ -5949,7 +6000,7 @@ } #endif while (self->children_dbs) { - dummy=DB_close_internal(self->children_dbs,0); + dummy=DB_close_internal(self->children_dbs, 0, 0); Py_XDECREF(dummy); } @@ -6030,6 +6081,14 @@ self->txn=NULL; } + /* + ** "do_not_close" is used to dispose all related objects in the + ** tree, without actually releasing the "root" object. + ** This is done, for example, because function calls like + ** "DBSequence.remove()" implicitly close the underlying handle. So + ** the handle doesn't need to be closed, but related objects + ** must be cleaned up. + */ if (!do_not_close) { MYDB_BEGIN_ALLOW_THREADS err = self->sequence->close(self->sequence, flags); Modified: python/trunk/Modules/bsddb.h ============================================================================== --- python/trunk/Modules/bsddb.h (original) +++ python/trunk/Modules/bsddb.h Tue Sep 23 20:54:08 2008 @@ -105,7 +105,7 @@ #error "eek! DBVER can't handle minor versions > 9" #endif -#define PY_BSDDB_VERSION "4.7.3pre5" +#define PY_BSDDB_VERSION "4.7.3pre9" /* Python object definitions */

3 2

r66568 - svn:log
by jesus.cea 28 Sep '08

28 Sep '08

Author: jesus.cea Revision: 66568 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,4 @@ -Bugfix for issue3885 and 'DB.verify()' crash \ No newline at end of file +Bugfix for issue3885 and 'DB.verify()' crash. + +Reviewed by Nick Coghlan. +

1 0

r66676 - in python/trunk: Misc/NEWS Modules/bsddb.h
by jesus.cea 28 Sep '08

28 Sep '08

Author: jesus.cea Date: Mon Sep 29 01:24:19 2008 New Revision: 66676 Log: bsddb4.7.3pre9 renamed to 4.7.3 Modified: python/trunk/Misc/NEWS python/trunk/Modules/bsddb.h Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Mon Sep 29 01:24:19 2008 @@ -670,7 +670,7 @@ - Support for Windows 9x has been removed from the winsound module. -- bsddb module updated to version 4.7.3pre2. +- bsddb module updated to version 4.7.3. http://www.jcea.es/programacion/pybsddb.htm#bsddb3-4.7.3. This code should be compatible with Python 3.0. Modified: python/trunk/Modules/bsddb.h ============================================================================== --- python/trunk/Modules/bsddb.h (original) +++ python/trunk/Modules/bsddb.h Mon Sep 29 01:24:19 2008 @@ -105,7 +105,7 @@ #error "eek! DBVER can't handle minor versions > 9" #endif -#define PY_BSDDB_VERSION "4.7.3pre9" +#define PY_BSDDB_VERSION "4.7.3" /* Python object definitions */

1 0

buildbot failure in S-390 Debian 3.0
by buildbot＠python.org 28 Sep '08

28 Sep '08

The Buildbot has detected a new failure of S-390 Debian 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/S-390%20Debian%203.0/builds/939 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-s390 Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: benjamin.peterson,georg.brandl BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_doctest make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0