Mailman 3 November 2007 - Python-checkins

r58758 - python/trunk/Lib/bsddb/dbtables.py
by gregory.p.smith 02 Nov '07

02 Nov '07

Author: gregory.p.smith Date: Thu Nov 1 22:15:36 2007 New Revision: 58758 Modified: python/trunk/Lib/bsddb/dbtables.py Log: Undo revision 58533 58534 fixes. Those were a workaround for a problem introduced by 58385. Modified: python/trunk/Lib/bsddb/dbtables.py ============================================================================== --- python/trunk/Lib/bsddb/dbtables.py (original) +++ python/trunk/Lib/bsddb/dbtables.py Thu Nov 1 22:15:36 2007 @@ -360,12 +360,11 @@ unique = 0 while not unique: # Generate a random 64-bit row ID string - # (note: this code has <64 bits of randomness + # (note: might have <64 bits of true randomness # but it's plenty for our database id needs!) - # We must ensure that no null bytes are in the id value. blist = [] for x in xrange(_rowid_str_len): - blist.append(random.randint(1,255)) + blist.append(random.randint(0,255)) newid = struct.pack('B'*_rowid_str_len, *blist) # Guarantee uniqueness by adding this key to the database

1 0

r58757 - in python/trunk: Lib/bsddb/test/test_misc.py Modules/_bsddb.c
by gregory.p.smith 02 Nov '07

02 Nov '07

Author: gregory.p.smith Date: Thu Nov 1 22:08:14 2007 New Revision: 58757 Modified: python/trunk/Lib/bsddb/test/test_misc.py python/trunk/Modules/_bsddb.c Log: Fix bug introduced in revision 58385. Database keys could no longer have NULL bytes in them. Replace the errant strdup with a malloc+memcpy. Adds a unit test for the correct behavior. Modified: python/trunk/Lib/bsddb/test/test_misc.py ============================================================================== --- python/trunk/Lib/bsddb/test/test_misc.py (original) +++ python/trunk/Lib/bsddb/test/test_misc.py Thu Nov 1 22:08:14 2007 @@ -30,10 +30,8 @@ os.remove(self.filename) except OSError: pass - import glob - files = glob.glob(os.path.join(self.homeDir, '*')) - for file in files: - os.remove(file) + import shutil + shutil.rmtree(self.homeDir) def test01_badpointer(self): dbs = dbshelve.open(self.filename) @@ -73,6 +71,25 @@ db1.close() os.unlink(self.filename) + def test05_key_with_null_bytes(self): + try: + db1 = db.DB() + db1.open(self.filename, None, db.DB_HASH, db.DB_CREATE) + db1['a'] = 'eh?' + db1['a\x00'] = 'eh zed.' + db1['a\x00a'] = 'eh zed eh?' + db1['aaa'] = 'eh eh eh!' + keys = db1.keys() + keys.sort() + self.assertEqual(['a', 'a\x00', 'a\x00a', 'aaa'], keys) + self.assertEqual(db1['a'], 'eh?') + self.assertEqual(db1['a\x00'], 'eh zed.') + self.assertEqual(db1['a\x00a'], 'eh zed eh?') + self.assertEqual(db1['aaa'], 'eh eh eh!') + finally: + db1.close() + os.unlink(self.filename) + #---------------------------------------------------------------------- Modified: python/trunk/Modules/_bsddb.c ============================================================================== --- python/trunk/Modules/_bsddb.c (original) +++ python/trunk/Modules/_bsddb.c Thu Nov 1 22:08:14 2007 @@ -335,11 +335,13 @@ * the code check for DB_THREAD and forceably set DBT_MALLOC * when we otherwise would leave flags 0 to indicate that. */ - key->data = strdup(PyString_AS_STRING(keyobj)); + key->data = malloc(PyString_GET_SIZE(keyobj)); if (key->data == NULL) { PyErr_SetString(PyExc_MemoryError, "Key memory allocation failed"); return 0; } + memcpy(key->data, PyString_AS_STRING(keyobj), + PyString_GET_SIZE(keyobj)); key->flags = DB_DBT_REALLOC; key->size = PyString_GET_SIZE(keyobj); } @@ -5795,6 +5797,10 @@ ADD_INT(d, DB_NOPANIC); #endif +#ifdef DB_REGISTER + ADD_INT(d, DB_REGISTER); +#endif + #if (DBVER >= 42) ADD_INT(d, DB_TIME_NOTGRANTED); ADD_INT(d, DB_TXN_NOT_DURABLE);

1 0

buildbot failure in x86 XP-3 trunk
by buildbot＠python.org 02 Nov '07

02 Nov '07

The Buildbot has detected a new failure of x86 XP-3 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP-3%20trunk/builds/359 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: heller-windows Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: christian.heimes,georg.brandl,martin.v.loewis,raymond.hettinger BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_import ====================================================================== ERROR: test_trailing_slash (test.test_import.UnicodePathsTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot\work\trunk.heller-windows\build\lib\test\test_import.py", line 261, in test_trailing_slash mod = __import__("test_trailing_slash") ImportError: No module named test_trailing_slash sincerely, -The Buildbot

1 0

buildbot failure in x86 XP trunk
by buildbot＠python.org 02 Nov '07

02 Nov '07

The Buildbot has detected a new failure of x86 XP trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP%20trunk/builds/723 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: mcintyre-windows Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: christian.heimes,georg.brandl,martin.v.loewis,raymond.hettinger BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_import ====================================================================== ERROR: test_trailing_slash (test.test_import.UnicodePathsTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\buildbot_py25\trunk.mcintyre-windows\build\lib\test\test_import.py", line 261, in test_trailing_slash mod = __import__("test_trailing_slash") ImportError: No module named test_trailing_slash sincerely, -The Buildbot

1 0

r58753 - python/trunk/Doc/library/stdtypes.rst
by georg.brandl 02 Nov '07

02 Nov '07

Author: georg.brandl Date: Thu Nov 1 21:37:02 2007 New Revision: 58753 Modified: python/trunk/Doc/library/stdtypes.rst Log: Fix markup glitch. Modified: python/trunk/Doc/library/stdtypes.rst ============================================================================== --- python/trunk/Doc/library/stdtypes.rst (original) +++ python/trunk/Doc/library/stdtypes.rst Thu Nov 1 21:37:02 2007 @@ -938,7 +938,7 @@ specified, then there is no limit on the number of splits (all possible splits are made). - If *sep is given, consecutive delimiters are not grouped together and are + If *sep* is given, consecutive delimiters are not grouped together and are deemed to delimit empty strings (for example, ``'1,,2'.split(',')`` returns ``['1', '', '2']``). The *sep* argument may consist of multiple characters (for example, ``'1<>2<>3'.split('<>')`` returns ``['1', '2', '3']``).

1 0

r58751 - python/trunk/Lib/test/test_import.py
by christian.heimes 02 Nov '07

02 Nov '07

Author: christian.heimes Date: Thu Nov 1 21:11:06 2007 New Revision: 58751 Modified: python/trunk/Lib/test/test_import.py Log: Removed non ASCII text from test as requested by Guido. Sorry :/ Modified: python/trunk/Lib/test/test_import.py ============================================================================== --- python/trunk/Lib/test/test_import.py (original) +++ python/trunk/Lib/test/test_import.py Thu Nov 1 21:11:06 2007 @@ -223,8 +223,7 @@ warnings.simplefilter('error', ImportWarning) self.assertRaises(ImportWarning, __import__, "site-packages") -class UnicodePathsTests(unittest.TestCase): - SAMPLES = ('test', 'testäöüß', 'testéè', 'test°³²') +class PathsTests(unittest.TestCase): path = TESTFN def setUp(self): @@ -235,23 +234,6 @@ shutil.rmtree(self.path) sys.path = self.syspath - def test_sys_path(self): - for i, subpath in enumerate(self.SAMPLES): - path = os.path.join(self.path, subpath) - os.mkdir(path) - self.failUnless(os.path.exists(path), os.listdir(self.path)) - f = open(os.path.join(path, 'testimport%i.py' % i), 'w') - f.write("testdata = 'unicode path %i'\n" % i) - f.close() - sys.path.append(path) - try: - mod = __import__("testimport%i" % i) - except ImportError: - print >>sys.stderr, path - raise - self.assertEqual(mod.testdata, 'unicode path %i' % i) - unload("testimport%i" % i) - # http://bugs.python.org/issue1293 def test_trailing_slash(self): f = open(os.path.join(self.path, 'test_trailing_slash.py'), 'w') @@ -263,7 +245,7 @@ unload("test_trailing_slash") def test_main(verbose=None): - run_unittest(ImportTest, UnicodePathsTests) + run_unittest(ImportTest, PathsTests) if __name__ == '__main__': test_main()

1 0

buildbot failure in ia64 Ubuntu 3.0
by buildbot＠python.org 02 Nov '07

02 Nov '07

The Buildbot has detected a new failure of ia64 Ubuntu 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/ia64%20Ubuntu%203.0/builds/203 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-ia64 Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: christian.heimes BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_import ====================================================================== ERROR: test_sys_path (test.test_import.UnicodePathsTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/pybot/buildarea/3.0.klose-debian-ia64/build/Lib/test/test_import.py", line 176, in test_sys_path UnicodeEncodeError: 'ascii' codec can't encode characters in position 10-13: ordinal not in range(128) make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

buildbot failure in sparc solaris10 gcc 3.0
by buildbot＠python.org 02 Nov '07

02 Nov '07

The Buildbot has detected a new failure of sparc solaris10 gcc 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20solaris10%20gcc%203.0/builds… Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: loewis-sun Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: christian.heimes BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_import ====================================================================== ERROR: test_sys_path (test.test_import.UnicodePathsTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/opt/users/buildbot/slave/3.0.loewis-sun/build/Lib/test/test_import.py", line 183, in test_sys_path mod = __import__("testimport%i" % i) ImportError: No module named testimport1 sincerely, -The Buildbot

1 0

buildbot failure in amd64 XP 3.0
by buildbot＠python.org 02 Nov '07

02 Nov '07

The Buildbot has detected a new failure of amd64 XP 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/amd64%20XP%203.0/builds/196 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: heller-windows-amd64 Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: christian.heimes,guido.van.rossum BUILD FAILED: failed compile sincerely, -The Buildbot

1 0

r58750 - python/trunk/Lib/test/test_import.py
by christian.heimes 02 Nov '07

02 Nov '07

Author: christian.heimes Date: Thu Nov 1 20:48:10 2007 New Revision: 58750 Modified: python/trunk/Lib/test/test_import.py Log: Backport of import tests for bug http://bugs.python.org/issue1293 and bug http://bugs.python.org/issue1342 Modified: python/trunk/Lib/test/test_import.py ============================================================================== --- python/trunk/Lib/test/test_import.py (original) +++ python/trunk/Lib/test/test_import.py Thu Nov 1 20:48:10 2007 @@ -1,11 +1,13 @@ -from test.test_support import TESTFN, run_unittest, catch_warning +from test.test_support import TESTFN, run_unittest, catch_warning import unittest import os import random +import shutil import sys import py_compile import warnings +from test.test_support import unlink, TESTFN, unload def remove_files(name): @@ -221,8 +223,47 @@ warnings.simplefilter('error', ImportWarning) self.assertRaises(ImportWarning, __import__, "site-packages") +class UnicodePathsTests(unittest.TestCase): + SAMPLES = ('test', 'testäöüß', 'testéè', 'test°³²') + path = TESTFN + + def setUp(self): + os.mkdir(self.path) + self.syspath = sys.path[:] + + def tearDown(self): + shutil.rmtree(self.path) + sys.path = self.syspath + + def test_sys_path(self): + for i, subpath in enumerate(self.SAMPLES): + path = os.path.join(self.path, subpath) + os.mkdir(path) + self.failUnless(os.path.exists(path), os.listdir(self.path)) + f = open(os.path.join(path, 'testimport%i.py' % i), 'w') + f.write("testdata = 'unicode path %i'\n" % i) + f.close() + sys.path.append(path) + try: + mod = __import__("testimport%i" % i) + except ImportError: + print >>sys.stderr, path + raise + self.assertEqual(mod.testdata, 'unicode path %i' % i) + unload("testimport%i" % i) + + # http://bugs.python.org/issue1293 + def test_trailing_slash(self): + f = open(os.path.join(self.path, 'test_trailing_slash.py'), 'w') + f.write("testdata = 'test_trailing_slash'") + f.close() + sys.path.append(self.path+'/') + mod = __import__("test_trailing_slash") + self.assertEqual(mod.testdata, 'test_trailing_slash') + unload("test_trailing_slash") + def test_main(verbose=None): - run_unittest(ImportTest) + run_unittest(ImportTest, UnicodePathsTests) if __name__ == '__main__': test_main()

1 0