Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

#11515: Merge with 3.1.

This commit is contained in:
Ezio Melotti 2011-03-15 05:59:46 +02:00
parent c48c19afe0 42da663e6f
commit 4969f709cc
49 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/ctypes/test/test_functions.py
View File

@ -116,7 +116,7 @@ class FunctionTestCase(unittest.TestCase):
self.assertEqual(result, 21)
self.assertEqual(type(result), int)
# You cannot assing character format codes as restype any longer
# You cannot assign character format codes as restype any longer
self.assertRaises(TypeError, setattr, f, "restype", "i")
def test_floatresult(self):

2
Lib/decimal.py
View File

@ -6088,7 +6088,7 @@ def _parse_format_specifier(format_spec, _localeconv=None):
def _format_align(sign, body, spec):
"""Given an unpadded, non-aligned numeric string 'body' and sign
string 'sign', add padding and aligment conforming to the given
string 'sign', add padding and alignment conforming to the given
format specifier dictionary 'spec' (as produced by
parse_format_specifier).

2
Lib/email/mime/application.py
View File

@ -17,7 +17,7 @@ class MIMEApplication(MIMENonMultipart):
_encoder=encoders.encode_base64, **_params):
"""Create an application/* type MIME document.
_data is a string containing the raw applicatoin data.
_data is a string containing the raw application data.
_subtype is the MIME content type subtype, defaulting to
'octet-stream'.

2
Lib/ftplib.py
View File

@ -613,7 +613,7 @@ else:
Usage example:
>>> from ftplib import FTP_TLS
>>> ftps = FTP_TLS('ftp.python.org')
>>> ftps.login() # login anonimously previously securing control channel
>>> ftps.login() # login anonymously previously securing control channel
'230 Guest login ok, access restrictions apply.'
>>> ftps.prot_p() # switch to secure data connection
'200 Protection level set to P'

2
Lib/gettext.py
View File

@ -282,7 +282,7 @@ class GNUTranslations(NullTranslations):
# 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
# strongly encourages msgids to be us-ascii, but some appliations
# strongly encourages msgids to be us-ascii, but some applications
# require alternative encodings (e.g. Zope's ZCML and ZPT). For
# traditional gettext applications, the msgid conversion will
# cause no problems since us-ascii should always be a subset of

2
Lib/http/client.py
View File

@ -798,7 +798,7 @@ class HTTPConnection:
del self._buffer[:]
# If msg and message_body are sent in a single send() call,
# it will avoid performance problems caused by the interaction
# between delayed ack and the Nagle algorithim.
# between delayed ack and the Nagle algorithm.
if isinstance(message_body, bytes):
msg += message_body
message_body = None

4
Lib/idlelib/EditorWindow.py
View File

@ -104,8 +104,8 @@ class EditorWindow(object):
self.top = top = WindowList.ListedToplevel(root, menu=self.menubar)
if flist:
self.tkinter_vars = flist.vars
#self.top.instance_dict makes flist.inversedict avalable to
#configDialog.py so it can access all EditorWindow instaces
#self.top.instance_dict makes flist.inversedict available to
#configDialog.py so it can access all EditorWindow instances
self.top.instance_dict = flist.inversedict
else:
self.tkinter_vars = {} # keys: Tkinter event names

2
Lib/idlelib/HISTORY.txt
View File

@ -13,7 +13,7 @@ What's New in IDLEfork 0.8.1?
- New tarball released as a result of the 'revitalisation' of the IDLEfork
project.
- 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.

4
Lib/importlib/_bootstrap.py
View File

@ -152,7 +152,7 @@ def _check_name(method):
loader can handle.
The first argument (self) must define _name which the second argument is
comapred against. If the comparison fails then ImportError is raised.
compared against. If the comparison fails then ImportError is raised.
"""
def inner(self, name, *args, **kwargs):
@ -304,7 +304,7 @@ class _LoaderBasics:
def _bytes_from_bytecode(self, fullname, data, source_mtime):
"""Return the marshalled bytes from bytecode, verifying the magic
number and timestamp alon the way.
number and timestamp along the way.
If source_mtime is None then skip the timestamp check.

4
Lib/nntplib.py
View File

@ -315,7 +315,7 @@ class _NNTPBase:
readermode is sometimes necessary if you are connecting to an
NNTP server on the local machine and intend to call
reader-specific comamnds, such as `group'. If you get
reader-specific commands, such as `group'. If you get
unexpected NNTPPermanentErrors, you might need to set
readermode.
"""
@ -1001,7 +1001,7 @@ class NNTP(_NNTPBase):
readermode is sometimes necessary if you are connecting to an
NNTP server on the local machine and intend to call
reader-specific comamnds, such as `group'. If you get
reader-specific commands, such as `group'. If you get
unexpected NNTPPermanentErrors, you might need to set
readermode.
"""

2
Lib/socketserver.py
View File

@ -675,7 +675,7 @@ class StreamRequestHandler(BaseRequestHandler):
# A timeout to apply to the request socket, if not None.
timeout = None
# Disable nagle algoritm for this socket, if True.
# Disable nagle algorithm for this socket, if True.
# Use only when wbufsize != 0, to avoid small packets.
disable_nagle_algorithm = False

2
Lib/test/crashers/recursion_limit_too_high.py
View File

@ -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.

2
Lib/test/test_compile.py
View File

@ -190,7 +190,7 @@ if 1:
self.assertEqual(eval("-" + all_one_bits), -18446744073709551615)
else:
self.fail("How many bits *does* this machine have???")
# Verify treatment of contant folding on -(sys.maxsize+1)
# Verify treatment of constant folding on -(sys.maxsize+1)
# i.e. -2147483648 on 32 bit platforms. Should return int, not long.
self.assertIsInstance(eval("%s" % (-sys.maxsize - 1)), int)
self.assertIsInstance(eval("%s" % (-sys.maxsize - 2)), int)

2
Lib/test/test_descr.py
View File

@ -772,7 +772,7 @@ class ClassPropertiesAndMethods(unittest.TestCase):
# see "A Monotonic Superclass Linearization for Dylan",
# by Kim Barrett et al. (OOPSLA 1996)
def test_consistency_with_epg(self):
# Testing consistentcy with EPG...
# Testing consistency with EPG...
class Pane(object): pass
class ScrollingMixin(object): pass
class EditingMixin(object): pass

2
Lib/test/test_numeric_tower.py
View File

@ -1,4 +1,4 @@
# test interactions betwen int, float, Decimal and Fraction
# test interactions between int, float, Decimal and Fraction
import unittest
import random

4
Lib/test/test_os.py
View File

@ -277,7 +277,7 @@ class StatAttributeTests(unittest.TestCase):
except TypeError:
pass
# Use the constructr with a too-long tuple.
# Use the constructor with a too-long tuple.
try:
result2 = os.stat_result((0,1,2,3,4,5,6,7,8,9,10,11,12,13,14))
except TypeError:
@ -333,7 +333,7 @@ class StatAttributeTests(unittest.TestCase):
except TypeError:
pass
# Use the constructr with a too-long tuple.
# Use the constructor with a too-long tuple.
try:
result2 = os.statvfs_result((0,1,2,3,4,5,6,7,8,9,10,11,12,13,14))
except TypeError:

2
Lib/test/test_re.py
View File

@ -7,7 +7,7 @@ from weakref import proxy
# 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

2
Lib/test/test_set.py
View File

@ -583,7 +583,7 @@ class TestSet(TestJointOps):
self.le_called = True
return False
# This first tries the bulitin rich set comparison, which doesn't know
# This first tries the builtin rich set comparison, which doesn't know
# how to handle the custom object. Upon returning NotImplemented, the
# corresponding comparison on the right object is invoked.
myset = {1, 2, 3}

2
Lib/test/test_string.py
View File

@ -93,7 +93,7 @@ class ModuleTest(unittest.TestCase):
# test all parameters used
class CheckAllUsedFormatter(string.Formatter):
def check_unused_args(self, used_args, args, kwargs):
# Track which arguments actuallly got used
# Track which arguments actually got used
unused_args = set(kwargs.keys())
unused_args.update(range(0, len(args)))

2
Lib/test/test_warnings.py
View File

@ -758,7 +758,7 @@ class PyEnvironmentVariableTests(EnvironmentVariableTests):
class BootstrapTest(unittest.TestCase):
def test_issue_8766(self):
# "import encodings" emits a warning whereas the warnings is not loaded
# or not completly loaded (warnings imports indirectly encodings by
# or not completely loaded (warnings imports indirectly encodings by
# importing linecache) yet
with support.temp_cwd() as cwd, support.temp_cwd('encodings'):
env = os.environ.copy()

2
Lib/tkinter/__init__.py
View File

@ -1649,7 +1649,7 @@ class Wm:
class Tk(Misc, Wm):
"""Toplevel widget of Tk which represents mostly the main window
of an appliation. It has an associated Tcl interpreter."""
of an application. It has an associated Tcl interpreter."""
_w = '.'
def __init__(self, screenName=None, baseName=None, className='Tk',
useTk=1, sync=0, use=None):

2
Lib/tkinter/tix.py
View File

@ -163,7 +163,7 @@ class tixCommand:
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
tix_ getimage, you can advoid hard coding the pathnames of the
tix_ getimage, you can avoid hard coding the pathnames of the
image files in your application. When successful, this command
returns the name of the newly created image, which can be used to
configure the -image option of the Tk and Tix widgets.

2
Lib/tkinter/ttk.py
View File

@ -993,7 +993,7 @@ class Panedwindow(Widget, tkinter.PanedWindow):
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.
Otherwise, sets the options to the correspoding values."""
Otherwise, sets the options to the corresponding values."""
if option is not None:
kw[option] = None
return _val_or_dict(kw, self.tk.call, self._w, "pane", pane)

4
Lib/turtle.py
View File

@ -1464,7 +1464,7 @@ class TurtleScreen(TurtleScreenBase):
Optional argument:
picname -- a string, name of a gif-file or "nopic".
If picname is a filename, set the corresponing image as background.
If picname is a filename, set the corresponding image as background.
If picname is "nopic", delete backgroundimage, if present.
If picname is None, return the filename of the current backgroundimage.
@ -3352,7 +3352,7 @@ class RawTurtle(TPen, TNavigator):
def dot(self, size=None, *color):
"""Draw a dot with diameter size, using color.
Optional argumentS:
Optional arguments:
size -- an integer >= 1 (if given)
color -- a colorstring or a numeric color tuple

2
Lib/xml/dom/minidom.py
View File

@ -1476,7 +1476,7 @@ class ElementInfo(object):
return False
def isId(self, aname):
"""Returns true iff the named attribte is a DTD-style ID."""
"""Returns true iff the named attribute is a DTD-style ID."""
return False
def isIdNS(self, namespaceURI, localName):

2
Mac/BuildScript/build-installer.py
View File

@ -100,7 +100,7 @@ UNIVERSALARCHS = '32-bit'
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(

4
Mac/Tools/pythonw.c
View File

@ -105,8 +105,8 @@ setup_spawnattr(posix_spawnattr_t* spawnattr)
count = 1;
/* Run the real python executable using the same architure as this
* executable, this allows users to controle the architecture using
/* Run the real python executable using the same architecture as this
* executable, this allows users to control the architecture using
* "arch -ppc python"
*/

2
Modules/_ctypes/callproc.c
View File

@ -49,7 +49,7 @@
So, there are 4 data structures holding processed arguments:
- the inargs tuple (in PyCFuncPtr_call)
- the callargs tuple (in PyCFuncPtr_call)
- the 'struct argguments' array
- the 'struct arguments' array
- the 'void *' array
*/

4
Modules/_ctypes/libffi/ChangeLog
View File

@ -3084,7 +3084,7 @@
2003-09-18 Kaz Kojima <kkojima@gcc.gnu.org>
* src/sh/ffi.c (ffi_prep_args): Take account into the alignement
* src/sh/ffi.c (ffi_prep_args): Take account into the alignment
for the register size.
(ffi_closure_helper_SYSV): Handle the structure return value
address correctly.
@ -3344,7 +3344,7 @@
2003-02-06 Andreas Tobler <a.tobler@schweiz.ch>
* libffi/src/powerpc/darwin_closure.S:
Fix alignement bug, allocate 8 bytes for the result.
Fix alignment bug, allocate 8 bytes for the result.
* libffi/src/powerpc/aix_closure.S:
Likewise.
* libffi/src/powerpc/ffi_darwin.c:

4
Modules/_ctypes/libffi/src/dlmalloc.c
View File

@ -1326,7 +1326,7 @@ static void* win32direct_mmap(size_t size) {
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 @@ static int win32munmap(void* ptr, size_t size) {
#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 */

2
Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
View File

@ -592,7 +592,7 @@ typedef struct aix_fd_struct {
+---------------------------------------+ 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

2
Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
View File

@ -650,7 +650,7 @@ ffi_call(
+---------------------------------------+ 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

2
Modules/_struct.c
View File

@ -1111,7 +1111,7 @@ whichtable(char **pfmt)
case '>':
case '!': /* Network byte order is big-endian */
return bigendian_table;
case '=': { /* Host byte order -- different from native in aligment! */
case '=': { /* Host byte order -- different from native in alignment! */
int n = 1;
char *p = (char *) &n;
if (*p == 1)

2
Modules/_threadmodule.c
View File

@ -823,7 +823,7 @@ _ldict(localobject *self)
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
acces */
access */
PyDict_DelItem(tdict, self->key);
return NULL;
}

2
Modules/parsermodule.c
View File

@ -1569,7 +1569,7 @@ validate_expr_stmt(node *tree)
|| strcmp(s, ">>=") == 0
|| strcmp(s, "**=") == 0);
if (!res)
err_string("illegal augmmented assignment operator");
err_string("illegal augmented assignment operator");
}
}
else {

2
Modules/posixmodule.c
View File

@ -1281,7 +1281,7 @@ win32_xstat_w(const wchar_t *path, struct win32_stat *result, BOOL traverse)
win32_stat will first explicitly resolve the symlink target and then will
call win32_lstat on that result.
The _w represent Unicode equivalents of the aformentioned ANSI functions. */
The _w represent Unicode equivalents of the aforementioned ANSI functions. */
static int
win32_lstat(const char* path, struct win32_stat *result)

2
Modules/zipimport.c
View File

@ -1172,7 +1172,7 @@ get_code_from_data(ZipImporter *self, int ispackage, int isbytecode,
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,

2
Objects/bytearrayobject.c
View File

@ -2221,7 +2221,7 @@ bytearray_extend(PyByteArrayObject *self, PyObject *arg)
if (it == NULL)
return NULL;
/* Try to determine the length of the argument. 32 is abitrary. */
/* Try to determine the length of the argument. 32 is arbitrary. */
buf_size = _PyObject_LengthHint(arg, 32);
if (buf_size == -1) {
Py_DECREF(it);

2
Objects/bytesobject.c
View File

@ -487,7 +487,7 @@ PyObject *PyBytes_DecodeEscape(const char *s,
default:
*p++ = '\\';
s--;
goto non_esc; /* an arbitry number of unescaped
goto non_esc; /* an arbitrary number of unescaped
UTF-8 bytes may follow. */
}
}

2
Objects/longobject.c
View File

@ -3120,7 +3120,7 @@ ah*bh and al*bl too.
* of slices, each with a->ob_size digits, and multiply the slices by a,
* one at a time. This gives k_mul balanced inputs to work with, and is
* also cache-friendly (we compute one double-width slice of the result
* at a time, then move on, never bactracking except for the helpful
* at a time, then move on, never backtracking except for the helpful
* single-width slice overlap between successive partial sums).
*/
static PyLongObject *

2
Objects/stringlib/string_format.h
View File

@ -6,7 +6,7 @@
*/
/* 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

2
PC/bdist_wininst/install.c
View File

@ -62,7 +62,7 @@
* instead showing the user an empty listbox to select something from.
*
* Finish the code so that we can use other python installations
* additionaly to those found in the registry,
* additionally to those found in the registry,
* and then #define USE_OTHER_PYTHON_VERSIONS
*
* - install a help-button, which will display something meaningful

2
Parser/spark.py
View File

@ -23,7 +23,7 @@ __version__ = 'SPARK-0.7 (pre-alpha-5)'
import re
# Compatability with older pythons.
# Compatibility with older pythons.
def output(string='', end='\n'):
sys.stdout.write(string + end)

2
Python/_warnings.c
View File

@ -764,7 +764,7 @@ PyErr_WarnEx(PyObject *category, const char *text, Py_ssize_t stack_level)
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

2
Python/sysmodule.c
View File

@ -686,7 +686,7 @@ PyDoc_STRVAR(getwindowsversion_doc,
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\

2
Tools/demo/ss1.py
View File

@ -586,7 +586,7 @@ class SheetGUI:
cell = Tk.Label(self.cellgrid, relief='raised')
cell.grid_configure(column=0, row=0, sticky='NSWE')
cell.bind("<ButtonPress-1>", self.selectall)
# Create the top row of labels, and confiure the grid columns
# Create the top row of labels, and configure the grid columns
for x in range(1, columns+1):
self.cellgrid.grid_columnconfigure(x, minsize=64)
cell = Tk.Label(self.cellgrid, text=colnum2name(x), relief='raised')

2
Tools/msi/msi.py
View File

@ -178,7 +178,7 @@ mingw_lib = os.path.join(srcdir, PCBUILD, "libpython%s%s.a" % (major, minor))
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"):

4
Tools/pybench/pybench.py
View File

@ -682,7 +682,7 @@ class Benchmark:
other_total_avg_time = other_total_avg_time + other_avg_time
if (benchmarks_compatible and
test.compatible(other)):
# Both benchmark and tests are comparible
# Both benchmark and tests are comparable
min_diff = ((min_time * self.warp) /
(other_min_time * other.warp) - 1.0)
avg_diff = ((avg_time * self.warp) /
@ -696,7 +696,7 @@ class Benchmark:
else:
avg_diff = '%+5.1f%%' % (avg_diff * PERCENT)
else:
# Benchmark or tests are not comparible
# Benchmark or tests are not comparable
min_diff, avg_diff = 'n/a', 'n/a'
tests_compatible = 0
print('%30s: %5.0fms %5.0fms %7s %5.0fms %5.0fms %7s' % \

2
setup.py
View File

@ -901,7 +901,7 @@ class PyBuildExt(build_ext):
db_dirs_to_check = tmp
# Look for a version specific db-X.Y before an ambiguoius dbX
# Look for a version specific db-X.Y before an ambiguous dbX
# XXX should we -ever- look for a dbX name? Do any
# systems really not name their library by version and
# symlink to more general names?