Mailman 3 December 2005 - Python-checkins

commit of r41859 - python/trunk/Lib/test/test_logging.py
by tim.peters 30 Dec '05

30 Dec '05

Author: tim.peters Date: Fri Dec 30 21:46:23 2005 New Revision: 41859 Modified: python/trunk/Lib/test/test_logging.py Log: test_main(): Restore the original root logger level after running the tests. This stops the confusing/annoying: No handlers could be found for logger "cookielib" message we got whenever some test running after test_logging happened to use cookielib.py (when not using regrtest's -r, this happened during test_urllib2; when using -r, it varied). Modified: python/trunk/Lib/test/test_logging.py ============================================================================== --- python/trunk/Lib/test/test_logging.py (original) +++ python/trunk/Lib/test/test_logging.py Fri Dec 30 21:46:23 2005 @@ -487,11 +487,20 @@ # or a Mac OS X box which supports very little locale stuff at all original_locale = None + # Save and restore the original root logger level across the tests. + # Otherwise, e.g., if any test using cookielib runs after test_logging, + # cookielib's debug-level logger tries to log messages, leading to + # confusing: + # No handlers could be found for logger "cookielib" + # output while the tests are running. + root_logger = logging.getLogger("") + original_logging_level = root_logger.getEffectiveLevel() try: test_main_inner() finally: if original_locale is not None: locale.setlocale(locale.LC_ALL, original_locale) + root_logger.setLevel(original_logging_level) if __name__ == "__main__": sys.stdout.write("test_logging\n")

1 0

commit of r41858 - in python/trunk: Lib/test/test_descr.py setup.py
by tim.peters 30 Dec '05

30 Dec '05

Author: tim.peters Date: Fri Dec 30 19:42:42 2005 New Revision: 41858 Modified: python/trunk/Lib/test/test_descr.py python/trunk/setup.py Log: Whitespace normalization. Modified: python/trunk/Lib/test/test_descr.py ============================================================================== --- python/trunk/Lib/test/test_descr.py (original) +++ python/trunk/Lib/test/test_descr.py Fri Dec 30 19:42:42 2005 @@ -1664,7 +1664,7 @@ pass else: raise TestFailed, "non-sequence mro() return not caught" - + def overloading(): if verbose: print "Testing operator overloading..." Modified: python/trunk/setup.py ============================================================================== --- python/trunk/setup.py (original) +++ python/trunk/setup.py Fri Dec 30 19:42:42 2005 @@ -159,7 +159,7 @@ line = line.split() remove_modules.append(line[0]) input.close() - + for ext in self.extensions[:]: if ext.name in remove_modules: self.extensions.remove(ext)

1 0

commit of r41857 - sandbox/trunk/setuptools/setuptools/command/develop.py sandbox/trunk/setuptools/setuptools/command/egg_info.py
by phillip.eby 30 Dec '05

30 Dec '05

Author: phillip.eby Date: Fri Dec 30 17:35:42 2005 New Revision: 41857 Modified: sandbox/trunk/setuptools/setuptools/command/develop.py sandbox/trunk/setuptools/setuptools/command/egg_info.py Log: Allow most commands to work with an existing .egg-info directory w/a '-' in it, but warn about it and refuse to run "develop" until the existing directory is renamed. This should allow older source distributions and checkouts to keep working with 0.6a9. Modified: sandbox/trunk/setuptools/setuptools/command/develop.py ============================================================================== --- sandbox/trunk/setuptools/setuptools/command/develop.py (original) +++ sandbox/trunk/setuptools/setuptools/command/develop.py Fri Dec 30 17:35:42 2005 @@ -2,6 +2,7 @@ from distutils.util import convert_path from pkg_resources import Distribution, PathMetadata, normalize_path from distutils import log +from distutils.errors import * import sys, os class develop(easy_install): @@ -38,11 +39,14 @@ - def finalize_options(self): ei = self.get_finalized_command("egg_info") - self.args = [ei.egg_name] - + if ei.broken_egg_info: + raise DistutilsError( + "Please rename %r to %r before using 'develop'" + % (ei.egg_info, ei.broken_egg_info) + ) + self.args = [ei.egg_name] easy_install.finalize_options(self) self.egg_link = os.path.join(self.install_dir, ei.egg_name+'.egg-link') self.egg_base = ei.egg_base @@ -76,10 +80,6 @@ - - - - def uninstall_link(self): if os.path.exists(self.egg_link): log.info("Removing %s (link to %s)", self.egg_link, self.egg_base) Modified: sandbox/trunk/setuptools/setuptools/command/egg_info.py ============================================================================== --- sandbox/trunk/setuptools/setuptools/command/egg_info.py (original) +++ sandbox/trunk/setuptools/setuptools/command/egg_info.py Fri Dec 30 17:35:42 2005 @@ -37,7 +37,7 @@ self.tag_build = None self.tag_svn_revision = 0 self.tag_date = 0 - + self.broken_egg_info = False def finalize_options (self): self.egg_name = safe_name(self.distribution.get_name()) @@ -61,6 +61,7 @@ self.egg_info = self.egg_name.replace('-','_')+'.egg-info' if self.egg_base != os.curdir: self.egg_info = os.path.join(self.egg_base, self.egg_info) + if '-' in self.egg_name: self.check_broken_egg_info() # Set package version for the benefit of dumber commands # (e.g. sdist, bdist_wininst, etc.) @@ -79,7 +80,6 @@ - def write_or_delete_file(self, what, filename, data): """Write `data` to `filename` or delete if empty @@ -170,6 +170,20 @@ mm.run() self.filelist = mm.filelist + def check_broken_egg_info(self): + bei = self.egg_name+'.egg-info' + if self.egg_base != os.curdir: + bei = os.path.join(self.egg_base, bei) + if os.path.exists(bei): + log.warn( + "-"*78+'\n' + "Note: Your current .egg-info directory has a '-' in its name;" + '\nthis will not work correctly with "setup.py develop".\n\n' + 'Please rename %s to %s to correct this problem.\n'+'-'*78, + bei, self.egg_info + ) + self.broken_egg_info = self.egg_info + self.egg_info = bei # make it work for now class FileList(FileList): """File list that accepts only existing, platform-independent paths""" @@ -190,23 +204,10 @@ - - - - - - - - - - - - - class manifest_maker(sdist): template = "MANIFEST.in" - + def initialize_options (self): self.use_defaults = 1 self.prune = 1 @@ -300,7 +301,7 @@ safe = getattr(cmd.distribution,'zip_safe',None) import bdist_egg; bdist_egg.write_safety_flag(cmd.egg_info, safe) - + def warn_depends_obsolete(cmd, basename, filename): if os.path.exists(filename): log.warn(

1 0

commit of r41856 - sandbox/trunk/setuptools/setuptools/command/egg_info.py
by phillip.eby 30 Dec '05

30 Dec '05

Author: phillip.eby Date: Fri Dec 30 17:11:35 2005 New Revision: 41856 Modified: sandbox/trunk/setuptools/setuptools/command/egg_info.py Log: Fix unescaped '-' in .egg-info directory names. Note that this means you must rename any existing .egg-info directory inside a project that has a '-' in it! Modified: sandbox/trunk/setuptools/setuptools/command/egg_info.py ============================================================================== --- sandbox/trunk/setuptools/setuptools/command/egg_info.py (original) +++ sandbox/trunk/setuptools/setuptools/command/egg_info.py Fri Dec 30 17:11:35 2005 @@ -58,7 +58,7 @@ self.egg_base = (dirs or {}).get('',os.curdir) self.ensure_dirname('egg_base') - self.egg_info = self.egg_name+'.egg-info' + self.egg_info = self.egg_name.replace('-','_')+'.egg-info' if self.egg_base != os.curdir: self.egg_info = os.path.join(self.egg_base, self.egg_info)

1 0

commit of r41855 - python/branches/release24-maint/Lib/test/test_locale.py
by martin.v.loewis 30 Dec '05

30 Dec '05

Author: martin.v.loewis Date: Fri Dec 30 13:52:13 2005 New Revision: 41855 Modified: python/branches/release24-maint/Lib/test/test_locale.py Log: Work around test_locale failing on Solaris 10. Modified: python/branches/release24-maint/Lib/test/test_locale.py ============================================================================== --- python/branches/release24-maint/Lib/test/test_locale.py (original) +++ python/branches/release24-maint/Lib/test/test_locale.py Fri Dec 30 13:52:13 2005 @@ -38,13 +38,15 @@ print "yes" try: - testformat("%f", 1024, grouping=1, output='1,024.000000') + # On Solaris 10, the thousands_sep is the empty string + sep = locale.localeconv()['thousands_sep'] + testformat("%f", 1024, grouping=1, output='1%s024.000000' % sep) testformat("%f", 102, grouping=1, output='102.000000') testformat("%f", -42, grouping=1, output='-42.000000') testformat("%+f", -42, grouping=1, output='-42.000000') testformat("%20.f", -42, grouping=1, output=' -42') - testformat("%+10.f", -4200, grouping=1, output=' -4,200') - testformat("%-10.f", 4200, grouping=1, output='4,200 ') + testformat("%+10.f", -4200, grouping=1, output=' -4%s200' % sep) + testformat("%-10.f", 4200, grouping=1, output='4%s200 ' % sep) # Invoke getpreferredencoding to make sure it does not cause exceptions, locale.getpreferredencoding() finally: @@ -65,6 +67,9 @@ print "yes" try: + if sys.platform == 'sunos5': + # On Solaris, in en_US.UTF-8, \xa0 is a space + raise locale.Error oldlocale = locale.setlocale(locale.LC_CTYPE) locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8') except locale.Error:

1 0

commit of r41854 - python/trunk/Lib/test/test_locale.py
by martin.v.loewis 30 Dec '05

30 Dec '05

Author: martin.v.loewis Date: Fri Dec 30 13:51:45 2005 New Revision: 41854 Modified: python/trunk/Lib/test/test_locale.py Log: Work around test_locale failing on Solaris. Will backport to 2.4. Modified: python/trunk/Lib/test/test_locale.py ============================================================================== --- python/trunk/Lib/test/test_locale.py (original) +++ python/trunk/Lib/test/test_locale.py Fri Dec 30 13:51:45 2005 @@ -38,13 +38,15 @@ print "yes" try: - testformat("%f", 1024, grouping=1, output='1,024.000000') + # On Solaris 10, the thousands_sep is the empty string + sep = locale.localeconv()['thousands_sep'] + testformat("%f", 1024, grouping=1, output='1%s024.000000' % sep) testformat("%f", 102, grouping=1, output='102.000000') testformat("%f", -42, grouping=1, output='-42.000000') testformat("%+f", -42, grouping=1, output='-42.000000') testformat("%20.f", -42, grouping=1, output=' -42') - testformat("%+10.f", -4200, grouping=1, output=' -4,200') - testformat("%-10.f", 4200, grouping=1, output='4,200 ') + testformat("%+10.f", -4200, grouping=1, output=' -4%s200' % sep) + testformat("%-10.f", 4200, grouping=1, output='4%s200 ' % sep) # Invoke getpreferredencoding to make sure it does not cause exceptions, locale.getpreferredencoding() finally: @@ -65,6 +67,9 @@ print "yes" try: + if sys.platform == 'sunos5': + # On Solaris, in en_US.UTF-8, \xa0 is a space + raise locale.Error oldlocale = locale.setlocale(locale.LC_CTYPE) locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8') except locale.Error:

1 0

commit of r41853 - in python/branches/release24-maint: Misc/NEWS configure configure.in
by martin.v.loewis 30 Dec '05

30 Dec '05

Author: martin.v.loewis Date: Fri Dec 30 13:32:48 2005 New Revision: 41853 Modified: python/branches/release24-maint/Misc/NEWS python/branches/release24-maint/configure python/branches/release24-maint/configure.in Log: Use -xcode=pic32 for SunPro. Modified: python/branches/release24-maint/Misc/NEWS ============================================================================== --- python/branches/release24-maint/Misc/NEWS (original) +++ python/branches/release24-maint/Misc/NEWS Fri Dec 30 13:32:48 2005 @@ -105,6 +105,8 @@ Build ----- +- Use -xcode=pic32 for CCSHARED on Solaris with SunPro. + - The Windows .msi files are now compressed using lzx:21. This produces a significantly smaller installer. Modified: python/branches/release24-maint/configure ============================================================================== --- python/branches/release24-maint/configure (original) +++ python/branches/release24-maint/configure Fri Dec 30 13:32:48 2005 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 39265 . +# From configure.in Revision: 41546 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for python 2.4. # @@ -10412,6 +10412,7 @@ case $ac_sys_system/$ac_sys_release in SunOS*) if test "$GCC" = yes; then CCSHARED="-fPIC"; + else CCSHARED="-xcode=pic32"; fi;; hp*|HP*) if test "$GCC" = yes; then CCSHARED="-fPIC"; Modified: python/branches/release24-maint/configure.in ============================================================================== --- python/branches/release24-maint/configure.in (original) +++ python/branches/release24-maint/configure.in Fri Dec 30 13:32:48 2005 @@ -1410,6 +1410,7 @@ case $ac_sys_system/$ac_sys_release in SunOS*) if test "$GCC" = yes; then CCSHARED="-fPIC"; + else CCSHARED="-xcode=pic32"; fi;; hp*|HP*) if test "$GCC" = yes; then CCSHARED="-fPIC";

1 0

commit of r41852 - in python/trunk: Misc/NEWS configure configure.in
by martin.v.loewis 30 Dec '05

30 Dec '05

Author: martin.v.loewis Date: Fri Dec 30 13:31:38 2005 New Revision: 41852 Modified: python/trunk/Misc/NEWS python/trunk/configure python/trunk/configure.in Log: Use -xcode=pic32 for SunPro. Will backport to 2.4. Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Fri Dec 30 13:31:38 2005 @@ -630,6 +630,8 @@ Build ----- +- Use -xcode=pic32 for CCSHARED on Solaris with SunPro. + - Bug #1189330: configure did not correctly determine the necessary value of LINKCC if python was built with GCC 4.0. Modified: python/trunk/configure ============================================================================== --- python/trunk/configure (original) +++ python/trunk/configure Fri Dec 30 13:31:38 2005 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 39267 . +# From configure.in Revision: 41764 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for python 2.5. # @@ -10413,6 +10413,7 @@ case $ac_sys_system/$ac_sys_release in SunOS*) if test "$GCC" = yes; then CCSHARED="-fPIC"; + else CCSHARED="-xcode=pic32"; fi;; hp*|HP*) if test "$GCC" = yes; then CCSHARED="-fPIC"; Modified: python/trunk/configure.in ============================================================================== --- python/trunk/configure.in (original) +++ python/trunk/configure.in Fri Dec 30 13:31:38 2005 @@ -1410,6 +1410,7 @@ case $ac_sys_system/$ac_sys_release in SunOS*) if test "$GCC" = yes; then CCSHARED="-fPIC"; + else CCSHARED="-xcode=pic32"; fi;; hp*|HP*) if test "$GCC" = yes; then CCSHARED="-fPIC";

1 0

commit of r41851 - in python/branches/ssize_t: Include/longobject.h Objects/intobject.c Objects/listobject.c Objects/longobject.c Objects/stringobject.c Objects/tupleobject.c Objects/unicodeobject.c
by martin.v.loewis 30 Dec '05

30 Dec '05

Author: martin.v.loewis Date: Fri Dec 30 11:16:44 2005 New Revision: 41851 Modified: python/branches/ssize_t/Include/longobject.h python/branches/ssize_t/Objects/intobject.c python/branches/ssize_t/Objects/listobject.c python/branches/ssize_t/Objects/longobject.c python/branches/ssize_t/Objects/stringobject.c python/branches/ssize_t/Objects/tupleobject.c python/branches/ssize_t/Objects/unicodeobject.c Log: Remove PyLong_AsSsize_t. Modified: python/branches/ssize_t/Include/longobject.h ============================================================================== --- python/branches/ssize_t/Include/longobject.h (original) +++ python/branches/ssize_t/Include/longobject.h Fri Dec 30 11:16:44 2005 @@ -18,11 +18,11 @@ PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLong(unsigned long); PyAPI_FUNC(PyObject *) PyLong_FromDouble(double); PyAPI_FUNC(long) PyLong_AsLong(PyObject *); -PyAPI_FUNC(Py_ssize_t) PyLong_AsSsize_t(PyObject *); PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLong(PyObject *); PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLongMask(PyObject *); /* For use by intobject.c only */ +PyAPI_FUNC(Py_ssize_t) _PyLong_AsSsize_t(PyObject *); PyAPI_FUNC(PyObject *) _PyLong_FromSize_t(size_t); PyAPI_FUNC(PyObject *) _PyLong_FromSsize_t(Py_ssize_t); Modified: python/branches/ssize_t/Objects/intobject.c ============================================================================== --- python/branches/ssize_t/Objects/intobject.c (original) +++ python/branches/ssize_t/Objects/intobject.c Fri Dec 30 11:16:44 2005 @@ -188,6 +188,8 @@ Py_ssize_t PyInt_AsSsize_t(register PyObject *op) { + if (op && !PyInt_CheckExact(op) && PyLong_Check(op)) + return _PyLong_AsSsize_t(op); #if SIZEOF_SIZE_T==SIZEOF_LONG return PyInt_AsLong(op); #else Modified: python/branches/ssize_t/Objects/listobject.c ============================================================================== --- python/branches/ssize_t/Objects/listobject.c (original) +++ python/branches/ssize_t/Objects/listobject.c Fri Dec 30 11:16:44 2005 @@ -2453,14 +2453,8 @@ static PyObject * list_subscript(PyListObject* self, PyObject* item) { - if (PyInt_Check(item)) { - long i = PyInt_AS_LONG(item); - if (i < 0) - i += PyList_GET_SIZE(self); - return list_item(self, i); - } - else if (PyLong_Check(item)) { - Py_ssize_t i = PyLong_AsSsize_t(item); + if (PyInt_Check(item) || PyLong_Check(item)) { + Py_ssize_t i = PyInt_AsSsize_t(item); if (i == -1 && PyErr_Occurred()) return NULL; if (i < 0) Modified: python/branches/ssize_t/Objects/longobject.c ============================================================================== --- python/branches/ssize_t/Objects/longobject.c (original) +++ python/branches/ssize_t/Objects/longobject.c Fri Dec 30 11:16:44 2005 @@ -245,7 +245,7 @@ Returns -1 and sets an error condition if overflow occurs. */ Py_ssize_t -PyLong_AsSsize_t(PyObject *vv) +_PyLong_AsSsize_t(PyObject *vv) { register PyLongObject *v; size_t x, prev; @@ -253,8 +253,6 @@ int sign; if (vv == NULL || !PyLong_Check(vv)) { - if (vv != NULL && PyInt_Check(vv)) - return PyInt_AsSsize_t(vv); PyErr_BadInternalCall(); return -1; } Modified: python/branches/ssize_t/Objects/stringobject.c ============================================================================== --- python/branches/ssize_t/Objects/stringobject.c (original) +++ python/branches/ssize_t/Objects/stringobject.c Fri Dec 30 11:16:44 2005 @@ -1169,14 +1169,8 @@ static PyObject* string_subscript(PyStringObject* self, PyObject* item) { - if (PyInt_Check(item)) { - long i = PyInt_AS_LONG(item); - if (i < 0) - i += PyString_GET_SIZE(self); - return string_item(self,i); - } - else if (PyLong_Check(item)) { - Py_ssize_t i = PyLong_AsSsize_t(item); + if (PyInt_Check(item) || PyLong_Check(item)) { + Py_ssize_t i = PyInt_AsSsize_t(item); if (i == -1 && PyErr_Occurred()) return NULL; if (i < 0) Modified: python/branches/ssize_t/Objects/tupleobject.c ============================================================================== --- python/branches/ssize_t/Objects/tupleobject.c (original) +++ python/branches/ssize_t/Objects/tupleobject.c Fri Dec 30 11:16:44 2005 @@ -585,14 +585,8 @@ static PyObject* tuplesubscript(PyTupleObject* self, PyObject* item) { - if (PyInt_Check(item)) { - long i = PyInt_AS_LONG(item); - if (i < 0) - i += PyTuple_GET_SIZE(self); - return tupleitem(self, i); - } - else if (PyLong_Check(item)) { - Py_ssize_t i = PyLong_AsSsize_t(item); + if (PyInt_Check(item) || PyLong_Check(item)) { + Py_ssize_t i = PyInt_AsSsize_t(item); if (i == -1 && PyErr_Occurred()) return NULL; if (i < 0) Modified: python/branches/ssize_t/Objects/unicodeobject.c ============================================================================== --- python/branches/ssize_t/Objects/unicodeobject.c (original) +++ python/branches/ssize_t/Objects/unicodeobject.c Fri Dec 30 11:16:44 2005 @@ -6465,13 +6465,8 @@ static PyObject* unicode_subscript(PyUnicodeObject* self, PyObject* item) { - if (PyInt_Check(item)) { - long i = PyInt_AS_LONG(item); - if (i < 0) - i += PyString_GET_SIZE(self); - return unicode_getitem(self, i); - } else if (PyLong_Check(item)) { - Py_ssize_t i = PyLong_AsSsize_t(item); + if (PyInt_Check(item) || PyLong_Check(item)) { + Py_ssize_t i = PyInt_AsSsize_t(item); if (i == -1 && PyErr_Occurred()) return NULL; if (i < 0)

1 0

commit of r41850 - python/branches/ssize_t/Modules/_elementtree.c
by martin.v.loewis 30 Dec '05

30 Dec '05

Author: martin.v.loewis Date: Fri Dec 30 11:00:32 2005 New Revision: 41850 Modified: python/branches/ssize_t/Modules/_elementtree.c Log: Change module to be backwards compatible. Modified: python/branches/ssize_t/Modules/_elementtree.c ============================================================================== --- python/branches/ssize_t/Modules/_elementtree.c (original) +++ python/branches/ssize_t/Modules/_elementtree.c Fri Dec 30 11:00:32 2005 @@ -92,6 +92,9 @@ #endif /* compatibility macros */ +#if (PY_VERSION_HEX < 0x02050000) +typedef int Py_ssize_t; +#endif #if (PY_VERSION_HEX < 0x02040000) #define PyDict_CheckExact PyDict_Check #if (PY_VERSION_HEX < 0x02020000) @@ -916,8 +919,9 @@ } static PyObject* -element_getitem(ElementObject* self, Py_ssize_t index) +element_getitem(PyObject* _self, Py_ssize_t index) { + ElementObject* self = (ElementObject*)_self; if (!self->extra || index < 0 || index >= self->extra->length) { PyErr_SetString( PyExc_IndexError, @@ -931,8 +935,9 @@ } static PyObject* -element_getslice(ElementObject* self, Py_ssize_t start, Py_ssize_t end) +element_getslice(PyObject* _self, Py_ssize_t start, Py_ssize_t end) { + ElementObject* self = (ElementObject*)_self; Py_ssize_t i; PyObject* list; @@ -1158,8 +1163,9 @@ } static int -element_setslice(ElementObject* self, Py_ssize_t start, Py_ssize_t end, PyObject* item) +element_setslice(PyObject* _self, Py_ssize_t start, Py_ssize_t end, PyObject* item) { + ElementObject* self = (ElementObject*)_self; int i, new, old; PyObject* recycle = NULL; @@ -1228,8 +1234,9 @@ } static int -element_setitem(ElementObject* self, Py_ssize_t index, PyObject* item) +element_setitem(PyObject* _self, Py_ssize_t index, PyObject* item) { + ElementObject* self = (ElementObject*)_self; int i; PyObject* old; @@ -1371,10 +1378,10 @@ (inquiry) element_length, 0, /* sq_concat */ 0, /* sq_repeat */ - (ssizeargfunc) element_getitem, - (ssizessizeargfunc) element_getslice, - (ssizeobjargproc) element_setitem, - (ssizessizeobjargproc) element_setslice, + element_getitem, + element_getslice, + element_setitem, + element_setslice, }; statichere PyTypeObject Element_Type = {

1 0