[Python-checkins] cpython (merge 3.1 -> 3.2): #11515: Merge with 3.1. (original) (raw)

ezio.melotti python-checkins at python.org
Tue Mar 15 05:00:21 CET 2011


http://hg.python.org/cpython/rev/81d7f78a633a changeset: 68489:81d7f78a633a branch: 3.2 parent: 68486:e5a5fafd3e4f parent: 68488:0991b40e895d user: Ezio Melotti <ezio.melotti at gmail.com> date: Tue Mar 15 05:59:46 2011 +0200 summary: #11515: Merge with 3.1.

files: Lib/decimal.py Lib/ftplib.py Lib/gettext.py Lib/http/client.py Lib/idlelib/EditorWindow.py Lib/importlib/_bootstrap.py Lib/nntplib.py Lib/socketserver.py Lib/test/test_compile.py Lib/test/test_descr.py Lib/test/test_numeric_tower.py Lib/test/test_os.py Lib/test/test_re.py Lib/test/test_set.py Lib/test/test_warnings.py Lib/tkinter/init.py Lib/tkinter/tix.py Lib/tkinter/ttk.py Lib/turtle.py Lib/xml/dom/minidom.py Mac/BuildScript/build-installer.py Mac/Tools/pythonw.c Misc/ACKS Modules/_ctypes/callproc.c Modules/_ctypes/libffi/ChangeLog Modules/_ctypes/libffi/src/dlmalloc.c Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c Modules/_struct.c Modules/_threadmodule.c Modules/parsermodule.c Modules/posixmodule.c Modules/zipimport.c Objects/bytearrayobject.c Objects/bytesobject.c Objects/longobject.c Objects/stringlib/string_format.h Python/_warnings.c Python/sysmodule.c Tools/demo/ss1.py Tools/msi/msi.py Tools/pybench/pybench.py setup.py

diff --git a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py --- a/Lib/ctypes/test/test_functions.py +++ b/Lib/ctypes/test/test_functions.py @@ -116,7 +116,7 @@ self.assertEqual(result, 21) self.assertEqual(type(result), int)

diff --git a/Lib/decimal.py b/Lib/decimal.py --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -6088,7 +6088,7 @@

def _format_align(sign, body, spec): """Given an unpadded, non-aligned numeric string 'body' and sign

diff --git a/Lib/email/mime/application.py b/Lib/email/mime/application.py --- a/Lib/email/mime/application.py +++ b/Lib/email/mime/application.py @@ -17,7 +17,7 @@ _encoder=encoders.encode_base64, **_params): """Create an application/* type MIME document.

diff --git a/Lib/ftplib.py b/Lib/ftplib.py --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -613,7 +613,7 @@ Usage example: >>> from ftplib import FTP_TLS >>> ftps = FTP_TLS('ftp.python.org')

diff --git a/Lib/gettext.py b/Lib/gettext.py --- a/Lib/gettext.py +++ b/Lib/gettext.py @@ -282,7 +282,7 @@ # Note: we unconditionally convert both msgids and msgstrs to # Unicode using the character encoding specified in the charset # parameter of the Content-Type header. The gettext documentation

diff --git a/Lib/http/client.py b/Lib/http/client.py --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -798,7 +798,7 @@ del self._buffer[:] # If msg and message_body are sent in a single send() call, # it will avoid performance problems caused by the interaction

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -104,8 +104,8 @@ self.top = top = WindowList.ListedToplevel(root, menu=self.menubar) if flist: self.tkinter_vars = flist.vars

diff --git a/Lib/idlelib/HISTORY.txt b/Lib/idlelib/HISTORY.txt --- a/Lib/idlelib/HISTORY.txt +++ b/Lib/idlelib/HISTORY.txt @@ -13,7 +13,7 @@

-- This release requires python 2.1 or better. Compatability with earlier +- This release requires python 2.1 or better. Compatibility with earlier versions of python (especially ancient ones like 1.5x) is no longer a priority in IDLEfork development.

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -152,7 +152,7 @@ loader can handle.

 The first argument (self) must define _name which the second argument is

@@ -304,7 +304,7 @@

 def _bytes_from_bytecode(self, fullname, data, source_mtime):
     """Return the marshalled bytes from bytecode, verifying the magic

diff --git a/Lib/nntplib.py b/Lib/nntplib.py --- a/Lib/nntplib.py +++ b/Lib/nntplib.py @@ -315,7 +315,7 @@

     readermode is sometimes necessary if you are connecting to an
     NNTP server on the local machine and intend to call

@@ -1001,7 +1001,7 @@

     readermode is sometimes necessary if you are connecting to an
     NNTP server on the local machine and intend to call

diff --git a/Lib/socketserver.py b/Lib/socketserver.py --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -675,7 +675,7 @@ # A timeout to apply to the request socket, if not None. timeout = None

diff --git a/Lib/test/crashers/recursion_limit_too_high.py b/Lib/test/crashers/recursion_limit_too_high.py --- a/Lib/test/crashers/recursion_limit_too_high.py +++ b/Lib/test/crashers/recursion_limit_too_high.py @@ -5,7 +5,7 @@

file handles.

The point of this example is to show that sys.setrecursionlimit() is a

-# hack, and not a robust solution. This example simply exercices a path +# hack, and not a robust solution. This example simply exercises a path

where it takes many C-level recursions, consuming a lot of stack

space, for each Python-level recursion. So 1000 times this amount of

stack space may be too much for standard platforms already.

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py --- a/Lib/test/test_compile.py +++ b/Lib/test/test_compile.py @@ -190,7 +190,7 @@ self.assertEqual(eval("-" + all_one_bits), -18446744073709551615) else: self.fail("How many bits does this machine have???")

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -772,7 +772,7 @@ # see "A Monotonic Superclass Linearization for Dylan", # by Kim Barrett et al. (OOPSLA 1996) def test_consistency_with_epg(self):

diff --git a/Lib/test/test_numeric_tower.py b/Lib/test/test_numeric_tower.py --- a/Lib/test/test_numeric_tower.py +++ b/Lib/test/test_numeric_tower.py @@ -1,4 +1,4 @@ -# test interactions betwen int, float, Decimal and Fraction +# test interactions between int, float, Decimal and Fraction

import unittest import random diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -277,7 +277,7 @@ except TypeError: pass

@@ -333,7 +333,7 @@ except TypeError: pass

diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -7,7 +7,7 @@

Misc tests from Tim Peters' re.doc

WARNING: Don't change details in these tests if you don't know

-# what you're doing. Some of these tests were carefuly modeled to +# what you're doing. Some of these tests were carefully modeled to

cover most of the code.

import unittest diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -583,7 +583,7 @@ self.le_called = True return False

diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py --- a/Lib/test/test_string.py +++ b/Lib/test/test_string.py @@ -93,7 +93,7 @@ # test all parameters used class CheckAllUsedFormatter(string.Formatter): def check_unused_args(self, used_args, args, kwargs):

diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py --- a/Lib/test/test_warnings.py +++ b/Lib/test/test_warnings.py @@ -758,7 +758,7 @@ class BootstrapTest(unittest.TestCase): def test_issue_8766(self): # "import encodings" emits a warning whereas the warnings is not loaded

diff --git a/Lib/tkinter/init.py b/Lib/tkinter/init.py --- a/Lib/tkinter/init.py +++ b/Lib/tkinter/init.py @@ -1649,7 +1649,7 @@

class Tk(Misc, Wm): """Toplevel widget of Tk which represents mostly the main window

diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py --- a/Lib/tkinter/tix.py +++ b/Lib/tkinter/tix.py @@ -163,7 +163,7 @@ extensions) exist, then the image type is chosen according to the depth of the X display: xbm images are chosen on monochrome displays and color images are chosen on color displays. By using

diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py --- a/Lib/tkinter/ttk.py +++ b/Lib/tkinter/ttk.py @@ -993,7 +993,7 @@ pane is either an integer index or the name of a managed subwindow. If kw is not given, returns a dict of the pane option values. If option is specified then the value for that option is returned.

diff --git a/Lib/turtle.py b/Lib/turtle.py --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -1464,7 +1464,7 @@ Optional argument: picname -- a string, name of a gif-file or "nopic".

@@ -3352,7 +3352,7 @@ def dot(self, size=None, *color): """Draw a dot with diameter size, using color.

diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py --- a/Lib/xml/dom/minidom.py +++ b/Lib/xml/dom/minidom.py @@ -1476,7 +1476,7 @@ return False

 def isId(self, aname):

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -100,7 +100,7 @@

ARCHLIST = universal_opts_map[UNIVERSALARCHS]

-# Source directory (asume we're in Mac/BuildScript) +# Source directory (assume we're in Mac/BuildScript) SRCDIR = os.path.dirname( os.path.dirname( os.path.dirname( diff --git a/Mac/Tools/pythonw.c b/Mac/Tools/pythonw.c --- a/Mac/Tools/pythonw.c +++ b/Mac/Tools/pythonw.c @@ -105,8 +105,8 @@

 count = 1;

diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -49,7 +49,7 @@ So, there are 4 data structures holding processed arguments:

*/ diff --git a/Modules/_ctypes/libffi/ChangeLog b/Modules/_ctypes/libffi/ChangeLog --- a/Modules/_ctypes/libffi/ChangeLog +++ b/Modules/_ctypes/libffi/ChangeLog @@ -3084,7 +3084,7 @@

2003-09-18 Kaz Kojima <kkojima at gcc.gnu.org>

@@ -3344,7 +3344,7 @@ 2003-02-06 Andreas Tobler <a.tobler at schweiz.ch>

 * libffi/src/powerpc/darwin_closure.S:

diff --git a/Modules/_ctypes/libffi/src/dlmalloc.c b/Modules/_ctypes/libffi/src/dlmalloc.c --- a/Modules/_ctypes/libffi/src/dlmalloc.c +++ b/Modules/_ctypes/libffi/src/dlmalloc.c @@ -1326,7 +1326,7 @@ return (ptr != 0)? ptr: MFAIL; }

-/* This function supports releasing coalesed segments / +/ This function supports releasing coalesced segments / static int win32munmap(void ptr, size_t size) { MEMORY_BASIC_INFORMATION minfo; char* cptr = ptr; @@ -1362,7 +1362,7 @@ #define CALL_MORECORE(S) MFAIL #endif /* HAVE_MORECORE */

-/* mstate bit set if continguous morecore disabled or failed / +/ mstate bit set if contiguous morecore disabled or failed */ #define USE_NONCONTIGUOUS_BIT (4U)

/* segment bit set in create_mspace_with_base / diff --git a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c --- a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c +++ b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c @@ -592,7 +592,7 @@ +---------------------------------------+ 160 | result area 8 | +---------------------------------------+ 168 - | alignement to the next multiple of 16 | + | alignment to the next multiple of 16 | SP current --> +---------------------------------------+ 176 <- parent frame | back chain to caller 4 | +---------------------------------------+ 180 diff --git a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c --- a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c +++ b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c @@ -650,7 +650,7 @@ +---------------------------------------+ 160 | result area 8 | +---------------------------------------+ 168 - | alignement to the next multiple of 16 | + | alignment to the next multiple of 16 | SP current --> +---------------------------------------+ 176 <- parent frame | back chain to caller 4 | +---------------------------------------+ 180 diff --git a/Modules/_struct.c b/Modules/_struct.c --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1111,7 +1111,7 @@ case '>': case '!': / Network byte order is big-endian */ return bigendian_table;

diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -823,7 +823,7 @@ self->args, self->kw) < 0) { /* we need to get rid of ldict from thread so we create a new one the next time we do an attr

diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -1569,7 +1569,7 @@ || strcmp(s, ">>=") == 0 || strcmp(s, "**=") == 0); if (!res)

static int win32_lstat(const char* path, struct win32_stat *result) diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -1172,7 +1172,7 @@ return code; }

-/* Get the code object assoiciated with the module specified by +/* Get the code object associated with the module specified by 'fullname'. */ static PyObject * get_module_code(ZipImporter *self, char *fullname, diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -2221,7 +2221,7 @@ if (it == NULL) return NULL;

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -487,7 +487,7 @@ default: *p++ = '\'; s--;

-/* Defines for Python 2.6 compatability / +/ Defines for Python 2.6 compatibility */ #if PY_VERSION_HEX < 0x03000000 #define PyLong_FromSsize_t _PyLong_FromSsize_t #endif diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -62,7 +62,7 @@

import re

-# Compatability with older pythons. +# Compatibility with older pythons. def output(string='', end='\n'): sys.stdout.write(string + end)

diff --git a/Python/_warnings.c b/Python/_warnings.c --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -764,7 +764,7 @@ return ret; }

-/* PyErr_Warn is only for backwards compatability and will be removed. +/* PyErr_Warn is only for backwards compatibility and will be removed. Use PyErr_WarnEx instead. */

#undef PyErr_Warn diff --git a/Python/sysmodule.c b/Python/sysmodule.c --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -686,7 +686,7 @@ Return information about the running version of Windows as a named tuple.\n
The members are named: major, minor, build, platform, service_pack,\n
service_pack_major, service_pack_minor, suite_mask, and product_type. For\n
-backward compatibiliy, only the first 5 items are available by indexing.\n
+backward compatibility, only the first 5 items are available by indexing.\n
All elements are numbers, except service_pack which is a string. Platform\n
may be 0 for win32s, 1 for Windows 9x/ME, 2 for Windows NT/2000/XP/Vista/7,\n
3 for Windows CE. Product_type may be 1 for a workstation, 2 for a domain\n
diff --git a/Tools/demo/ss1.py b/Tools/demo/ss1.py --- a/Tools/demo/ss1.py +++ b/Tools/demo/ss1.py @@ -586,7 +586,7 @@ cell = Tk.Label(self.cellgrid, relief='raised') cell.grid_configure(column=0, row=0, sticky='NSWE') cell.bind("", self.selectall)

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -178,7 +178,7 @@

have_mingw = build_mingw_lib(lib_file, def_file, dll_file, mingw_lib)

-# Determine the target architechture +# Determine the target architecture dll_path = os.path.join(srcdir, PCBUILD, dll_file) msilib.set_arch_from_file(dll_path) if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"): diff --git a/Tools/pybench/pybench.py b/Tools/pybench/pybench.py --- a/Tools/pybench/pybench.py +++ b/Tools/pybench/pybench.py @@ -682,7 +682,7 @@ other_total_avg_time = other_total_avg_time + other_avg_time if (benchmarks_compatible and test.compatible(other)):

@@ -696,7 +696,7 @@ else: avg_diff = '%+5.1f%%' % (avg_diff * PERCENT) else:

diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -901,7 +901,7 @@

                 db_dirs_to_check = tmp

-- Repository URL: http://hg.python.org/cpython



More information about the Python-checkins mailing list