Mailman 3 September 2003 - Python-checkins

python/dist/src/Modules _bsddb.c,1.19,1.20
by greg＠users.sourceforge.net 21 Sep '03

21 Sep '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv8947/extsrc Modified Files: _bsddb.c Log Message: raise pybsddb version number to 4.2.1 to differentiate between it and the version in the python 2.3.1 tree. Index: _bsddb.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** _bsddb.c 21 Sep 2003 00:08:14 -0000 1.19 --- _bsddb.c 21 Sep 2003 23:29:41 -0000 1.20 *************** *** 94,98 **** #define DBVER (DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) ! #define PY_BSDDB_VERSION "4.2.0" static char *rcs_id = "$Id$"; --- 94,98 ---- #define DBVER (DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) ! #define PY_BSDDB_VERSION "4.2.1" static char *rcs_id = "$Id$";

1 0

python/dist/src/Lib/bsddb __init__.py, 1.5.10.2, 1.5.10.3 db.py, 1.2, 1.2.16.1 dbshelve.py, 1.8, 1.8.10.1 dbutils.py, 1.6, 1.6.12.1
by greg＠users.sourceforge.net 21 Sep '03

21 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/bsddb In directory sc8-pr-cvs1:/tmp/cvs-serv7039 Modified Files: Tag: release23-maint __init__.py db.py dbshelve.py dbutils.py Log Message: simplify some import statements and clean up a docstring and BerkeleyDB library version check to mention that we support versions 3.2 - 4.2. Index: __init__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/__init__.py,v retrieving revision 1.5.10.2 retrieving revision 1.5.10.3 diff -C2 -d -r1.5.10.2 -r1.5.10.3 *** __init__.py 21 Sep 2003 04:51:46 -0000 1.5.10.2 --- __init__.py 21 Sep 2003 23:18:29 -0000 1.5.10.3 *************** *** 34,38 **** ! """Support for BerkeleyDB 3.1 through 4.1. """ --- 34,38 ---- ! """Support for BerkeleyDB 3.2 through 4.2. """ Index: db.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/db.py,v retrieving revision 1.2 retrieving revision 1.2.16.1 diff -C2 -d -r1.2 -r1.2.16.1 *** db.py 19 Nov 2002 17:48:48 -0000 1.2 --- db.py 21 Sep 2003 23:18:29 -0000 1.2.16.1 *************** *** 41,44 **** from _bsddb import __version__ ! if version() < (3, 1, 0): ! raise ImportError, "BerkeleyDB 3.x symbols not found. Perhaps python was statically linked with an older version?" --- 41,44 ---- from _bsddb import __version__ ! if version() < (3, 2, 0): ! raise ImportError, "correct BerkeleyDB symbols not found. Perhaps python was statically linked with an older version?" Index: dbshelve.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/dbshelve.py,v retrieving revision 1.8 retrieving revision 1.8.10.1 diff -C2 -d -r1.8 -r1.8.10.1 *** dbshelve.py 24 Apr 2003 16:02:46 -0000 1.8 --- dbshelve.py 21 Sep 2003 23:18:29 -0000 1.8.10.1 *************** *** 36,45 **** # DictMixin is new in Python 2.3 class DictMixin: pass ! try: ! # For Python 2.3 ! from bsddb import db ! except ImportError: ! # For earlier Pythons w/distutils pybsddb ! from bsddb3 import db #------------------------------------------------------------------------ --- 36,40 ---- # DictMixin is new in Python 2.3 class DictMixin: pass ! import db #------------------------------------------------------------------------ Index: dbutils.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/dbutils.py,v retrieving revision 1.6 retrieving revision 1.6.12.1 diff -C2 -d -r1.6 -r1.6.12.1 *** dbutils.py 28 Jan 2003 17:20:42 -0000 1.6 --- dbutils.py 21 Sep 2003 23:18:29 -0000 1.6.12.1 *************** *** 27,36 **** from time import sleep as _sleep ! try: ! # For Python 2.3 ! from bsddb import db ! except ImportError: ! # For earlier Pythons w/distutils pybsddb ! from bsddb3 import db # always sleep at least N seconds between retrys --- 27,31 ---- from time import sleep as _sleep ! import db # always sleep at least N seconds between retrys

1 0

python/dist/src/Modules _bsddb.c, 1.17.6.1, 1.17.6.2
by greg＠users.sourceforge.net 21 Sep '03

21 Sep '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv5605 Modified Files: Tag: release23-maint _bsddb.c Log Message: support for compiling with BerkeleyDB 4.2.x (soon to be released). this is a partial version of the 1.18->1.19 patch. i left out the ability for the module to also load as _pybsddb in addition to _bsddb as that applies more to pybsddb than python. Index: _bsddb.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v retrieving revision 1.17.6.1 retrieving revision 1.17.6.2 diff -C2 -d -r1.17.6.1 -r1.17.6.2 *** _bsddb.c 21 Sep 2003 23:06:20 -0000 1.17.6.1 --- _bsddb.c 21 Sep 2003 23:10:23 -0000 1.17.6.2 *************** *** 37,41 **** * Handwritten code to wrap version 3.x of the Berkeley DB library, * written to replace a SWIG-generated file. It has since been updated ! * to compile with BerkeleyDB versions 3.2 through 4.1. * * This module was started by Andrew Kuchling to remove the dependency --- 37,41 ---- * Handwritten code to wrap version 3.x of the Berkeley DB library, * written to replace a SWIG-generated file. It has since been updated ! * to compile with BerkeleyDB versions 3.2 through 4.2. * * This module was started by Andrew Kuchling to remove the dependency *************** *** 94,98 **** #define DBVER (DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) ! #define PY_BSDDB_VERSION "4.1.6" static char *rcs_id = "$Id$"; --- 94,98 ---- #define DBVER (DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) ! #define PY_BSDDB_VERSION "4.2.0" static char *rcs_id = "$Id$"; *************** *** 2168,2171 **** --- 2168,2182 ---- if (outFileName) fclose(outFile); + + /* DB.verify acts as a DB handle destructor (like close); this was + * documented in BerkeleyDB 4.2 but had the undocumented effect + * of not being safe in prior versions while still requiring an explicit + * DB.close call afterwards. Lets call close for the user to emulate + * the safe 4.2 behaviour. */ + #if (DBVER <= 41) + self->db->close(self->db, 0); + #endif + self->db = NULL; + RETURN_IF_ERR(); RETURN_NONE(); *************** *** 4341,4346 **** #define ADD_INT(dict, NAME) _addIntToDict(dict, #NAME, NAME) - - DL_EXPORT(void) init_bsddb(void) { --- 4352,4355 ---- *************** *** 4387,4391 **** --- 4396,4406 ---- ADD_INT(d, DB_MAX_RECORDS); + #if (DBVER >= 42) + ADD_INT(d, DB_RPCCLIENT); + #else ADD_INT(d, DB_CLIENT); + /* allow apps to be written using DB_RPCCLIENT on older BerkeleyDB */ + _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT); + #endif ADD_INT(d, DB_XA_CREATE); *************** *** 4536,4540 **** ADD_INT(d, DB_CURLSN); #endif ! #if (DBVER >= 33) ADD_INT(d, DB_COMMIT); #endif --- 4551,4555 ---- ADD_INT(d, DB_CURLSN); #endif ! #if ((DBVER >= 33) && (DBVER <= 41)) ADD_INT(d, DB_COMMIT); #endif *************** *** 4609,4612 **** --- 4624,4639 ---- ADD_INT(d, DB_PANIC_ENVIRONMENT); ADD_INT(d, DB_NOPANIC); + #endif + + #if (DBVER >= 42) + ADD_INT(d, DB_TIME_NOTGRANTED); + ADD_INT(d, DB_TXN_NOT_DURABLE); + ADD_INT(d, DB_TXN_WRITE_NOSYNC); + ADD_INT(d, DB_LOG_AUTOREMOVE); + ADD_INT(d, DB_DIRECT_LOG); + ADD_INT(d, DB_DIRECT_DB); + ADD_INT(d, DB_INIT_REP); + ADD_INT(d, DB_ENCRYPT); + ADD_INT(d, DB_CHKSUM); #endif

1 0

python/dist/src/Modules _bsddb.c,1.17,1.17.6.1
by greg＠users.sourceforge.net 21 Sep '03

21 Sep '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv4999 Modified Files: Tag: release23-maint _bsddb.c Log Message: port of 1.17->1.18 change. adds DBEnv.set_shm_key method. Index: _bsddb.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_bsddb.c,v retrieving revision 1.17 retrieving revision 1.17.6.1 diff -C2 -d -r1.17 -r1.17.6.1 *** _bsddb.c 15 Jul 2003 19:12:54 -0000 1.17 --- _bsddb.c 21 Sep 2003 23:06:20 -0000 1.17.6.1 *************** *** 3278,3281 **** --- 3278,3296 ---- static PyObject* + DBEnv_set_shm_key(DBEnvObject* self, PyObject* args) + { + int err; + long shm_key = 0; + + if (!PyArg_ParseTuple(args, "l:set_shm_key", &shm_key)) + return NULL; + CHECK_ENV_NOT_CLOSED(self); + + err = self->db_env->set_shm_key(self->db_env, shm_key); + RETURN_IF_ERR(); + RETURN_NONE(); + } + + static PyObject* DBEnv_set_cachesize(DBEnvObject* self, PyObject* args) { *************** *** 4077,4080 **** --- 4092,4096 ---- {"set_timeout", (PyCFunction)DBEnv_set_timeout, METH_VARARGS|METH_KEYWORDS}, #endif + {"set_shm_key", (PyCFunction)DBEnv_set_shm_key, METH_VARARGS}, {"set_cachesize", (PyCFunction)DBEnv_set_cachesize, METH_VARARGS}, {"set_data_dir", (PyCFunction)DBEnv_set_data_dir, METH_VARARGS},

1 0

python/nondist/sandbox/Lib bdist_dpkg.py, NONE, 1.1
by akuchling＠users.sourceforge.net 21 Sep '03

21 Sep '03

Update of /cvsroot/python/python/nondist/sandbox/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv3263 Added Files: bdist_dpkg.py Log Message: Stab at bdist_dpkg -- still needs a lot of work --- NEW FILE: bdist_dpkg.py --- """distutils.command.bdist_dpkg Implements the Distutils 'bdist_dpkg' command (create a Debian packaging). """ # This module should be kept compatible with Python 1.5.2. __revision__ = "$Id: bdist_dpkg.py,v 1.1 2003/09/21 19:56:14 akuchling Exp $" import sys, os, string import glob from types import * from distutils.core import Command from distutils.debug import DEBUG from distutils.util import get_platform from distutils.file_util import write_file from distutils.errors import * from distutils import log MARKER_STRING = "GENERATED BY BDIST_DPKG" class bdist_dpkg (Command): description = "create a DPKG distribution" user_options = [ ] boolean_options = [] def initialize_options (self): pass # initialize_options() def finalize_options (self): if os.name != 'posix': raise DistutilsPlatformError, \ ("don't know how to create DPKG " "distributions on platform %s" % os.name) # finalize_options() def run (self): if DEBUG: print "before _get_package_data():" self._create_dpkg_files() # build package log.info("building DPKG") #self.spawn(["dpkg-buildpackage", "-rfakeroot"]) # run() def _create_dpkg_files (self): # Files to create: # changelog, control, # Optional: docs, copyright # log.info("creating debian control files") if not os.path.exists('debian'): log.info("creating debian/ subdirectory") os.mkdir('debian') dirlist = "" for i in self.distribution.packages: dir = i dirlist += ' ' + dir dist = self.distribution package_name = dist.get_name().lower() d = {'name':dist.get_name(), 'package_name':package_name, 'pyversion': '%i.%i' % sys.version_info[0:2], 'dirlist':dirlist, 'marker':MARKER_STRING, } if not self._is_user_file('changelog') or True: log.info('writing changelog file') output = self._write_file('changelog') output.write("""%s (%s-%i) unstable; urgency=low * Dummy changelog line -- %s <%s> Wed, 11 Jun 2003 14:44:11 -0400 """ % (package_name, dist.get_version(), 1, # XXX build version dist.get_maintainer(), dist.get_maintainer_email())) output.close() if not self._is_user_file('control') or True: dist = self.distribution log.info('writing control file') output = self._write_file('control') #output.write('XXX-Dummy-Field: %s\n' % MARKER_STRING) output.write("Source: %s\n" % package_name) output.write("Priority: optional\n") output.write("Maintainer: %s <%s>\n" % (dist.get_maintainer(), dist.get_maintainer_email())) output.write("""Build-Depends: debhelper (>> 3.0.0) Standards-Version: 3.5.8 Section: libs """) output.write('\n') # Separator line output.write("Package: %s\n" % package_name) output.write("""Section: libs Architecture: all\n""") output.write("Depends: python%(pyversion)s\n" % d) output.write("Description: %s\n" % dist.get_description()) s = dist.get_long_description() s = string.replace(s, '\n', '\n ') output.write(' ' + s) output.close() if not self._is_user_file('postinst'): log.info('writing postinst file') output = self._write_file('postinst') output.write(POSTINST_FILE % d) output.close() if not self._is_user_file('prerm'): log.info('writing prerm file') output = self._write_file('prerm') output.write(PRERM_FILE % d) output.close() if not self._is_user_file('rules'): log.info('writing rules file') output = self._write_file('rules') output.write(RULES_FILE % d) output.close() os.chmod('debian/rules', 0755) def _write_file (self, filename): path = os.path.join('debian', filename) assert not self._is_user_file(path) output = open(path, 'w') return output def _is_user_file (self, filename): path = os.path.join('debian', filename) if not os.path.exists(path): return False input = open(path, 'r') while 1: L = input.readline() if L == "": break elif L.find(MARKER_STRING) != -1: return False return True # class bdist_dpkg PRERM_FILE = """#! /bin/sh # %(marker)s -- remove this line if you edit this file # prerm script for %(name)s set -e PACKAGE=%(name)s VERSION=%(pyversion)s LIB="/usr/lib/python$VERSION" DIRLIST="%(dirlist)s" case "$1" in remove|upgrade|failed-upgrade) for i in $DIRLIST ; do find $LIB/site-packages/$i -name '*.py[co]' -exec rm \{\} \; done ;; *) echo "prerm called with unknown argument \`$1'" >&2 exit 1 ;; esac exit 0 """ POSTINST_FILE = """#! /bin/sh # %(marker)s -- remove this line if you edit this file # postinst script for %(name)s # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> # * <conflictor's-postinst> `abort-remove' `in-favour' <package> # <new-version> # * <deconfigured's-postinst> `abort-deconfigure' `in-favour' # <failed-install-package> <version> `removing' # <conflicting-package> <version> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package # # quoting from the policy: # Any necessary prompting should almost always be confined to the # post-installation script, and should be protected with a conditional # so that unnecessary prompting doesn't happen if a package's # installation fails and the `postinst' is called with `abort-upgrade', # `abort-remove' or `abort-deconfigure'. PACKAGE=%(name)s VERSION=%(pyversion)s LIB="/usr/lib/python$VERSION" DIRLIST="%(dirlist)s" case "$1" in configure|abort-upgrade|abort-remove|abort-deconfigure) for i in $DIRLIST ; do /usr/bin/python$VERSION -O $LIB/compileall.py -q $LIB/site-packages/$i /usr/bin/python$VERSION $LIB/compileall.py -q $LIB/site-packages/$i done ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac exit 0 """ RULES_FILE = """#!/usr/bin/make -f # %(marker)s -- remove this line if you edit this file # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # This is the debhelper compatibility version to use. export DH_COMPAT=4 build: build-stamp /usr/bin/python2.2 setup.py build build-stamp: touch build-stamp configure: # Do nothing clean: dh_testdir dh_testroot rm -f build-stamp -rm -rf build dh_clean install: build dh_testdir dh_testroot dh_clean -k /usr/bin/python%(pyversion)s setup.py install --no-compile --prefix=$(CURDIR)/debian/%(package_name)s/usr # Build architecture-independent files here. binary-indep: install dh_testdir dh_testroot dh_installdocs dh_installdeb dh_gencontrol dh_md5sums dh_builddeb # We have nothing to do by default. binary: binary-indep .PHONY: build clean binary-indep binary install """

1 0

python/dist/src/Lib/test test_sets.py,1.27,1.28
by rhettinger＠users.sourceforge.net 21 Sep '03

21 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv13992 Modified Files: test_sets.py Log Message: Improve and expand identity tests. Index: test_sets.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sets.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** test_sets.py 30 Aug 2003 22:54:55 -0000 1.27 --- test_sets.py 21 Sep 2003 08:14:11 -0000 1.28 *************** *** 1,5 **** #!/usr/bin/env python ! import unittest, operator, copy, pickle from sets import Set, ImmutableSet from test import test_support --- 1,5 ---- #!/usr/bin/env python ! import unittest, operator, copy, pickle, random from sets import Set, ImmutableSet from test import test_support *************** *** 712,727 **** class TestIdentities(unittest.TestCase): def setUp(self): ! self.a = Set('abracadabra') ! self.b = Set('alacazam') def test_binopsVsSubsets(self): a, b = self.a, self.b ! self.assert_(a - b < a) ! self.assert_(b - a < b) ! self.assert_(a & b < a) ! self.assert_(a & b < b) ! self.assert_(a | b > a) ! self.assert_(a | b > b) ! self.assert_(a ^ b < a | b) def test_commutativity(self): --- 712,727 ---- class TestIdentities(unittest.TestCase): def setUp(self): ! self.a = Set([random.randrange(100) for i in xrange(50)]) ! self.b = Set([random.randrange(100) for i in xrange(50)]) def test_binopsVsSubsets(self): a, b = self.a, self.b ! self.assert_(a - b <= a) ! self.assert_(b - a <= b) ! self.assert_(a & b <= a) ! self.assert_(a & b <= b) ! self.assert_(a | b >= a) ! self.assert_(a | b >= b) ! self.assert_(a ^ b <= a | b) def test_commutativity(self): *************** *** 745,753 **** def test_exclusion(self): ! # check that inverse operations show non-overlap a, b, zero = self.a, self.b, Set() self.assertEqual((a-b)&b, zero) self.assertEqual((b-a)&a, zero) self.assertEqual((a&b)&(a^b), zero) #============================================================================== --- 745,760 ---- def test_exclusion(self): ! # check that inverse operations do not overlap a, b, zero = self.a, self.b, Set() self.assertEqual((a-b)&b, zero) self.assertEqual((b-a)&a, zero) self.assertEqual((a&b)&(a^b), zero) + + def test_cardinality_relations(self): + a, b = self.a, self.b + self.assertEqual(len(a), len(a-b) + len(a&b)) + self.assertEqual(len(b), len(b-a) + len(a&b)) + self.assertEqual(len(a^b), len(a-b) + len(b-a)) + self.assertEqual(len(a|b), len(a-b) + len(a&b) + len(b-a)) #==============================================================================

1 0

python/dist/src/Lib/bsddb __init__.py, 1.5.10.1, 1.5.10.2
by rhettinger＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/bsddb In directory sc8-pr-cvs1:/tmp/cvs-serv19704 Modified Files: Tag: release23-maint __init__.py Log Message: Backport Greg's patch (1.7 to 1.8) for backwards code compatability. Index: __init__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/__init__.py,v retrieving revision 1.5.10.1 retrieving revision 1.5.10.2 diff -C2 -d -r1.5.10.1 -r1.5.10.2 *** __init__.py 16 Sep 2003 21:42:13 -0000 1.5.10.1 --- __init__.py 21 Sep 2003 04:51:46 -0000 1.5.10.2 *************** *** 53,59 **** #---------------------------------------------------------------------- import UserDict ! class _DBWithCursor(UserDict.DictMixin): """ A simple wrapper around DB that makes it look like the bsddbobject in --- 53,88 ---- #---------------------------------------------------------------------- + import sys + + # for backwards compatibility with python versions older than 2.3, the + # iterator interface is dynamically defined and added using a mixin + # class. old python can't tokenize it due to the yield keyword. + if sys.version >= '2.3': + exec """ import UserDict + class _iter_mixin(UserDict.DictMixin): + def __iter__(self): + try: + yield self.first()[0] + next = self.next + while 1: + yield next()[0] + except _bsddb.DBNotFoundError: + return ! def iteritems(self): ! try: ! yield self.first() ! next = self.next ! while 1: ! yield next() ! except _bsddb.DBNotFoundError: ! return ! """ ! else: ! class _iter_mixin: pass ! ! ! class _DBWithCursor(_iter_mixin): """ A simple wrapper around DB that makes it look like the bsddbobject in *************** *** 146,166 **** return self.db.sync() - def __iter__(self): - try: - yield self.first()[0] - next = self.next - while 1: - yield next()[0] - except _bsddb.DBNotFoundError: - return - - def iteritems(self): - try: - yield self.first() - next = self.next - while 1: - yield next() - except _bsddb.DBNotFoundError: - return #---------------------------------------------------------------------- --- 175,178 ----

1 0

python/dist/src/Lib/test test_urllibnet.py, 1.6, 1.6.6.1
by rhettinger＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv18088 Modified Files: Tag: release23-maint test_urllibnet.py Log Message: Backport Tim's fix to SF #809915. Creates a url that should always be invalid. Index: test_urllibnet.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_urllibnet.py,v retrieving revision 1.6 retrieving revision 1.6.6.1 diff -C2 -d -r1.6 -r1.6.6.1 *** test_urllibnet.py 17 Jul 2003 16:31:00 -0000 1.6 --- test_urllibnet.py 21 Sep 2003 04:38:33 -0000 1.6.6.1 *************** *** 104,108 **** # address. self.assertRaises(IOError, ! urllib.urlopen, "http://www.sadflkjsasadf.com/") class urlretrieveNetworkTests(unittest.TestCase): --- 104,115 ---- # address. self.assertRaises(IOError, ! # SF patch 809915: In Sep 2003, VeriSign started ! # highjacking invalid .com and .net addresses to ! # boost traffic to their own site. This test ! # started failing then. One hopes the .invalid ! # domain will be spared to serve its defined ! # purpose. ! # urllib.urlopen, "http://www.sadflkjsasadf.com/") ! urllib.urlopen, "http://www.python.invalid/") class urlretrieveNetworkTests(unittest.TestCase):

1 0

python/dist/src/Python ast.c,1.1.2.32,1.1.2.33
by bcannon＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv16028/Python Modified Files: Tag: ast-branch ast.c Log Message: >From ast_for_atom() to the end of the file: - cleaned up syntax - check function return values - raise exceptions where appropriate Index: ast.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/ast.c,v retrieving revision 1.1.2.32 retrieving revision 1.1.2.33 diff -C2 -d -r1.1.2.32 -r1.1.2.33 *** ast.c 15 Sep 2003 00:20:51 -0000 1.1.2.32 --- ast.c 21 Sep 2003 00:17:48 -0000 1.1.2.33 *************** *** 11,17 **** /* XXX TO DO ! - re-indent this file ! - internal error checking (such as function return values, freeing memory, ! etc.) - syntax errors */ --- 11,16 ---- /* XXX TO DO [...1868 lines suppressed...] ! return ast_for_if_stmt(ch); ! case while_stmt: ! return ast_for_while_stmt(ch); ! case for_stmt: ! return ast_for_for_stmt(ch); ! case try_stmt: ! return ast_for_try_stmt(ch); ! case funcdef: ! return ast_for_funcdef(ch); ! case classdef: ! return ast_for_classdef(ch); ! default: ! PyErr_Format(PyExc_Exception, ! "unhandled small_stmt: TYPE=%d NCH=%d\n", ! TYPE(n), NCH(n)); ! return NULL; } } }

1 0

python/dist/src/Lib/bsddb/test test_all.py, 1.2, 1.3 test_associate.py, 1.5, 1.6 test_basics.py, 1.7, 1.8 test_compat.py, 1.5, 1.6 test_dbobj.py, 1.4, 1.5 test_dbshelve.py, 1.5, 1.6 test_dbtables.py, 1.5, 1.6 test_env_close.py, 1.5, 1.6 test_get_none.py, 1.4, 1.5 test_join.py, 1.6, 1.7 test_lock.py, 1.4, 1.5 test_misc.py, 1.4, 1.5 test_queue.py, 1.3, 1.4 test_recno.py, 1.6, 1.7 test_thread.py, 1.7, 1.8
by greg＠users.sourceforge.net 20 Sep '03

20 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/bsddb/test In directory sc8-pr-cvs1:/tmp/cvs-serv14110/bsddb/test Modified Files: test_all.py test_associate.py test_basics.py test_compat.py test_dbobj.py test_dbshelve.py test_dbtables.py test_env_close.py test_get_none.py test_join.py test_lock.py test_misc.py test_queue.py test_recno.py test_thread.py Log Message: Adds basic support for BerkeleyDB 4.2.x. Compiles and passes tests; new features in BerkeleyDB not exposed. notably: the DB_MPOOLFILE interface has not yet been wrapped in an object. Adds support for building and installing bsddb3 in python2.3 that has an older version of this module installed as bsddb without conflicts. The pybsddb.sf.net build/packaged version of the module uses a dynamicly loadable module called _pybsddb rather than _bsddb. Index: test_all.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_all.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test_all.py 28 Jan 2003 17:20:42 -0000 1.2 --- test_all.py 21 Sep 2003 00:08:14 -0000 1.3 *************** *** 18,26 **** def print_versions(): try: # For Python 2.3 from bsddb import db - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db print print '-=' * 38 --- 18,26 ---- def print_versions(): try: + # For Pythons w/distutils pybsddb + from bsddb3 import db + except ImportError: # For Python 2.3 from bsddb import db print print '-=' * 38 Index: test_associate.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_associate.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_associate.py 9 Jul 2003 04:45:59 -0000 1.5 --- test_associate.py 21 Sep 2003 00:08:14 -0000 1.6 *************** *** 18,26 **** try: # For Python 2.3 from bsddb import db, dbshelve - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db, dbshelve --- 18,26 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db, dbshelve + except ImportError: # For Python 2.3 from bsddb import db, dbshelve Index: test_basics.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_basics.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** test_basics.py 9 Jul 2003 04:45:59 -0000 1.7 --- test_basics.py 21 Sep 2003 00:08:14 -0000 1.8 *************** *** 14,22 **** try: # For Python 2.3 from bsddb import db - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db from test_all import verbose --- 14,22 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db + except ImportError: # For Python 2.3 from bsddb import db from test_all import verbose Index: test_compat.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_compat.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_compat.py 9 Jul 2003 05:29:24 -0000 1.5 --- test_compat.py 21 Sep 2003 00:08:14 -0000 1.6 *************** *** 11,19 **** try: # For Python 2.3 from bsddb import db, hashopen, btopen, rnopen - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db, hashopen, btopen, rnopen --- 11,19 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db, hashopen, btopen, rnopen + except ImportError: # For Python 2.3 from bsddb import db, hashopen, btopen, rnopen Index: test_dbobj.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_dbobj.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test_dbobj.py 28 Jan 2003 17:20:44 -0000 1.4 --- test_dbobj.py 21 Sep 2003 00:08:14 -0000 1.5 *************** *** 5,13 **** try: # For Python 2.3 from bsddb import db, dbobj - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db, dbobj --- 5,13 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db, dbobj + except ImportError: # For Python 2.3 from bsddb import db, dbobj Index: test_dbshelve.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_dbshelve.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_dbshelve.py 28 Jan 2003 17:20:44 -0000 1.5 --- test_dbshelve.py 21 Sep 2003 00:08:14 -0000 1.6 *************** *** 10,18 **** try: # For Python 2.3 from bsddb import db, dbshelve - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db, dbshelve from test_all import verbose --- 10,18 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db, dbshelve + except ImportError: # For Python 2.3 from bsddb import db, dbshelve from test_all import verbose Index: test_dbtables.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_dbtables.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_dbtables.py 28 Jan 2003 17:20:44 -0000 1.5 --- test_dbtables.py 21 Sep 2003 00:08:14 -0000 1.6 *************** *** 32,40 **** try: # For Python 2.3 from bsddb import db, dbtables - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db, dbtables --- 32,40 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db, dbtables + except ImportError: # For Python 2.3 from bsddb import db, dbtables Index: test_env_close.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_env_close.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_env_close.py 28 Jan 2003 17:20:44 -0000 1.5 --- test_env_close.py 21 Sep 2003 00:08:14 -0000 1.6 *************** *** 10,18 **** try: # For Python 2.3 from bsddb import db - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db from test_all import verbose --- 10,18 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db + except ImportError: # For Python 2.3 from bsddb import db from test_all import verbose Index: test_get_none.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_get_none.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test_get_none.py 28 Jan 2003 17:20:44 -0000 1.4 --- test_get_none.py 21 Sep 2003 00:08:14 -0000 1.5 *************** *** 9,17 **** try: # For Python 2.3 from bsddb import db - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db from test_all import verbose --- 9,17 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db + except ImportError: # For Python 2.3 from bsddb import db from test_all import verbose Index: test_join.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_join.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** test_join.py 21 Jul 2003 18:43:33 -0000 1.6 --- test_join.py 21 Sep 2003 00:08:14 -0000 1.7 *************** *** 17,25 **** try: # For Python 2.3 from bsddb import db, dbshelve - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db, dbshelve --- 17,25 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db, dbshelve + except ImportError: # For Python 2.3 from bsddb import db, dbshelve Index: test_lock.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_lock.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test_lock.py 27 Mar 2003 17:23:29 -0000 1.4 --- test_lock.py 21 Sep 2003 00:08:14 -0000 1.5 *************** *** 20,28 **** try: # For Python 2.3 from bsddb import db - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db --- 20,28 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db + except ImportError: # For Python 2.3 from bsddb import db Index: test_misc.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_misc.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test_misc.py 3 Feb 2003 04:19:40 -0000 1.4 --- test_misc.py 21 Sep 2003 00:08:14 -0000 1.5 *************** *** 7,15 **** try: # For Python 2.3 from bsddb import db, dbshelve - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db, dbshelve #---------------------------------------------------------------------- --- 7,15 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db, dbshelve + except ImportError: # For Python 2.3 from bsddb import db, dbshelve #---------------------------------------------------------------------- Index: test_queue.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_queue.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** test_queue.py 28 Jan 2003 17:20:44 -0000 1.3 --- test_queue.py 21 Sep 2003 00:08:14 -0000 1.4 *************** *** 9,17 **** try: # For Python 2.3 from bsddb import db - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db from test_all import verbose --- 9,17 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db + except ImportError: # For Python 2.3 from bsddb import db from test_all import verbose Index: test_recno.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_recno.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** test_recno.py 28 Jan 2003 17:20:44 -0000 1.6 --- test_recno.py 21 Sep 2003 00:08:14 -0000 1.7 *************** *** 12,20 **** try: # For Python 2.3 from bsddb import db - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' --- 12,20 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db + except ImportError: # For Python 2.3 from bsddb import db letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' Index: test_thread.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_thread.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** test_thread.py 21 Jul 2003 23:01:34 -0000 1.7 --- test_thread.py 21 Sep 2003 00:08:14 -0000 1.8 *************** *** 29,37 **** try: # For Python 2.3 from bsddb import db, dbutils - except ImportError: - # For earlier Pythons w/distutils pybsddb - from bsddb3 import db, dbutils --- 29,37 ---- try: + # For Pythons w/distutils pybsddb + from bsddb3 import db, dbutils + except ImportError: # For Python 2.3 from bsddb import db, dbutils

1 0