Skip to content

Commit

Permalink
Issue python#27171: Fix typos in documentation, comments, and test fu…
Browse files Browse the repository at this point in the history
…nction names
  • Loading branch information
vadmium committed Jun 2, 2016
1 parent 1b207c5 commit e26da7c
Show file tree
Hide file tree
Showing 30 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Include/pymacconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
* Therefore surpress the toolbox-glue in 64-bit mode.
*/

/* In 64-bit mode setpgrp always has no argments, in 32-bit
/* In 64-bit mode setpgrp always has no arguments, in 32-bit
* mode that depends on the compilation environment
*/
# undef SETPGRP_HAVE_ARG
Expand Down
12 changes: 6 additions & 6 deletions Lib/_osx_support.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def _find_appropriate_compiler(_config_vars):
# gcc-4.2 is either not present, or a copy of 'llvm-gcc' that
# miscompiles Python.

# skip checks if the compiler was overriden with a CC env variable
# skip checks if the compiler was overridden with a CC env variable
if 'CC' in os.environ:
return _config_vars

Expand Down Expand Up @@ -193,7 +193,7 @@ def _find_appropriate_compiler(_config_vars):
if cc != oldcc:
# Found a replacement compiler.
# Modify config vars using new compiler, if not already explicitly
# overriden by an env variable, preserving additional arguments.
# overridden by an env variable, preserving additional arguments.
for cv in _COMPILER_CONFIG_VARS:
if cv in _config_vars and cv not in os.environ:
cv_split = _config_vars[cv].split()
Expand All @@ -207,7 +207,7 @@ def _remove_universal_flags(_config_vars):
"""Remove all universal build arguments from config vars"""

for cv in _UNIVERSAL_CONFIG_VARS:
# Do not alter a config var explicitly overriden by env var
# Do not alter a config var explicitly overridden by env var
if cv in _config_vars and cv not in os.environ:
flags = _config_vars[cv]
flags = re.sub('-arch\s+\w+\s', ' ', flags, re.ASCII)
Expand All @@ -228,7 +228,7 @@ def _remove_unsupported_archs(_config_vars):
# build extensions on OSX 10.7 and later with the prebuilt
# 32-bit installer on the python.org website.

# skip checks if the compiler was overriden with a CC env variable
# skip checks if the compiler was overridden with a CC env variable
if 'CC' in os.environ:
return _config_vars

Expand All @@ -244,7 +244,7 @@ def _remove_unsupported_archs(_config_vars):
# across Xcode and compiler versions, there is no reliable way
# to be sure why it failed. Assume here it was due to lack of
# PPC support and remove the related '-arch' flags from each
# config variables not explicitly overriden by an environment
# config variables not explicitly overridden by an environment
# variable. If the error was for some other reason, we hope the
# failure will show up again when trying to compile an extension
# module.
Expand Down Expand Up @@ -292,7 +292,7 @@ def _check_for_unavailable_sdk(_config_vars):
sdk = m.group(1)
if not os.path.exists(sdk):
for cv in _UNIVERSAL_CONFIG_VARS:
# Do not alter a config var explicitly overriden by env var
# Do not alter a config var explicitly overridden by env var
if cv in _config_vars and cv not in os.environ:
flags = _config_vars[cv]
flags = re.sub(r'-isysroot\s+\S+(?:\s|$)', ' ', flags)
Expand Down
2 changes: 1 addition & 1 deletion Lib/_pydecimal.py
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ def __neg__(self, context=None):
def __pos__(self, context=None):
"""Returns a copy, unless it is a sNaN.
Rounds the number (if more then precision digits)
Rounds the number (if more than precision digits)
"""
if self._is_special:
ans = self._check_nans(context=context)
Expand Down
2 changes: 1 addition & 1 deletion Lib/_pyio.py
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,7 @@ def _read_unlocked(self, n=None):
break
avail += len(chunk)
chunks.append(chunk)
# n is more then avail only when an EOF occurred or when
# n is more than avail only when an EOF occurred or when
# read() would have blocked.
n = min(n, avail)
out = b"".join(chunks)
Expand Down
2 changes: 1 addition & 1 deletion Lib/distutils/tests/test_build_ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ def test_get_source_files(self):

def test_compiler_option(self):
# cmd.compiler is an option and
# should not be overriden by a compiler instance
# should not be overridden by a compiler instance
# when the command is run
dist = Distribution()
cmd = self.build_ext(dist)
Expand Down
2 changes: 1 addition & 1 deletion Lib/idlelib/AutoComplete.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""AutoComplete.py - An IDLE extension for automatically completing names.
This extension can complete either attribute names of file names. It can pop
This extension can complete either attribute names or file names. It can pop
a window with all available names, for the user to select from.
"""
import os
Expand Down
2 changes: 1 addition & 1 deletion Lib/idlelib/MultiCall.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def __del__(self):
raise

# An int in range(1 << len(_modifiers)) represents a combination of modifiers
# (if the least significent bit is on, _modifiers[0] is on, and so on).
# (if the least significant bit is on, _modifiers[0] is on, and so on).
# _state_subsets gives for each combination of modifiers, or *state*,
# a list of the states which are a subset of it. This list is ordered by the
# number of modifiers is the state - the most specific state comes first.
Expand Down
2 changes: 1 addition & 1 deletion Lib/idlelib/rpc.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""RPC Implemention, originally written for the Python Idle IDE
"""RPC Implementation, originally written for the Python Idle IDE
For security reasons, GvR requested that Idle's Python execution server process
connect to the Idle process, which listens for the connection. Since Idle has
Expand Down
2 changes: 1 addition & 1 deletion Lib/pathlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ def _format_parsed_parts(cls, drv, root, parts):
return cls._flavour.join(parts)

def _init(self):
# Overriden in concrete Path
# Overridden in concrete Path
pass

def _make_child(self, args):
Expand Down
2 changes: 1 addition & 1 deletion Lib/pdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
directory, it is read in and executed as if it had been typed at the
debugger prompt. This is particularly useful for aliases. If both
files exist, the one in the home directory is read first and aliases
defined there can be overriden by the local file.
defined there can be overridden by the local file.
Aside from aliases, the debugger is not directly programmable; but it
is implemented as a class from which you can derive your own debugger
Expand Down
2 changes: 1 addition & 1 deletion Lib/random.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ def _randbelow(self, n, int=int, maxsize=1<<BPF, type=type,
while r >= n:
r = getrandbits(k)
return r
# There's an overriden random() method but no new getrandbits() method,
# There's an overridden random() method but no new getrandbits() method,
# so we can only use random() from here.
if n >= maxsize:
_warn("Underlying random() generator does not supply \n"
Expand Down
4 changes: 2 additions & 2 deletions Lib/site.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
omitted because it is not mentioned in either path configuration file.
The readline module is also automatically configured to enable
completion for systems that support it. This can be overriden in
completion for systems that support it. This can be overridden in
sitecustomize, usercustomize or PYTHONSTARTUP.
After these operations, an attempt is made to import a module
Expand Down Expand Up @@ -379,7 +379,7 @@ def enablerlcompleter():
If the readline module can be imported, the hook will set the Tab key
as completion key and register ~/.python_history as history file.
This can be overriden in the sitecustomize or usercustomize module,
This can be overridden in the sitecustomize or usercustomize module,
or in a PYTHONSTARTUP file.
"""
def register_readline():
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_bigmem.py
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ def test_unicode_repr_wide(self, size):
finally:
r = s = None

# The original test_translate is overriden here, so as to get the
# The original test_translate is overridden here, so as to get the
# correct size estimate: str.translate() uses an intermediate Py_UCS4
# representation.

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_email/test_policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def test_overridden_register_defect_still_raises(self):
with self.assertRaisesRegex(self.MyDefect, "the telly is broken"):
self.MyPolicy(raise_on_defect=True).handle_defect(foo, defect)

def test_overriden_register_defect_works(self):
def test_overridden_register_defect_works(self):
foo = self.MyObj()
defect1 = self.MyDefect("one")
my_policy = self.MyPolicy()
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def test_module_finalization_at_shutdown(self):
b"len = len",
b"shutil.rmtree = rmtree"})

def test_descriptor_errors_propogate(self):
def test_descriptor_errors_propagate(self):
class Descr:
def __get__(self, o, t):
raise RuntimeError
Expand Down
6 changes: 3 additions & 3 deletions Lib/test/test_pep3151.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def test_errno_mapping(self):
e = SubOSError(EEXIST, "Bad file descriptor")
self.assertIs(type(e), SubOSError)

def test_init_overriden(self):
def test_init_overridden(self):
e = SubOSErrorWithInit("some message", "baz")
self.assertEqual(e.bar, "baz")
self.assertEqual(e.args, ("some message",))
Expand All @@ -174,7 +174,7 @@ def test_init_kwdargs(self):
self.assertEqual(e.bar, "baz")
self.assertEqual(e.args, ("some message",))

def test_new_overriden(self):
def test_new_overridden(self):
e = SubOSErrorWithNew("some message", "baz")
self.assertEqual(e.baz, "baz")
self.assertEqual(e.args, ("some message",))
Expand All @@ -184,7 +184,7 @@ def test_new_kwdargs(self):
self.assertEqual(e.baz, "baz")
self.assertEqual(e.args, ("some message",))

def test_init_new_overriden(self):
def test_init_new_overridden(self):
e = SubOSErrorCombinedInitFirst("some message", "baz")
self.assertEqual(e.bar, "baz")
self.assertEqual(e.baz, "baz")
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_random.py
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ def test_randbelow_logic(self, _log=log, int=int):
self.assertTrue(2**k > n > 2**(k-1)) # note the stronger assertion

@unittest.mock.patch('random.Random.random')
def test_randbelow_overriden_random(self, random_mock):
def test_randbelow_overridden_random(self, random_mock):
# Random._randbelow() can only use random() when the built-in one
# has been overridden but no new getrandbits() method was supplied.
random_mock.side_effect = random.SystemRandom().random
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_socket.py
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,7 @@ def test_idna(self):
# socket.gethostbyaddr('испытание.python.org')

def check_sendall_interrupted(self, with_timeout):
# socketpair() is not stricly required, but it makes things easier.
# socketpair() is not strictly required, but it makes things easier.
if not hasattr(signal, 'alarm') or not hasattr(socket, 'socketpair'):
self.skipTest("signal.alarm and socket.socketpair required for this test")
# Our signal handlers clobber the C errno by calling a math function
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_sys_setprofile.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def g(p):
(1, 'return', g_ident),
])

def test_exception_propogation(self):
def test_exception_propagation(self):
def f(p):
1/0
def g(p):
Expand Down
2 changes: 1 addition & 1 deletion Lib/tkinter/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3141,7 +3141,7 @@ def peer_create(self, newPathName, cnf={}, **kw): # new in Tk 8.5
"""Creates a peer text widget with the given newPathName, and any
optional standard configuration options. By default the peer will
have the same start and end line as the parent widget, but
these can be overriden with the standard configuration options."""
these can be overridden with the standard configuration options."""
self.tk.call(self._w, 'peer', 'create', newPathName,
*self._options(cnf, kw))
def peer_names(self): # new in Tk 8.5
Expand Down
2 changes: 1 addition & 1 deletion Lib/unittest/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def _removeTestAtIndex(self, index):
try:
test = self._tests[index]
except TypeError:
# support for suite implementations that have overriden self._tests
# support for suite implementations that have overridden self._tests
pass
else:
# Some unittest tests add non TestCase/TestSuite objects to
Expand Down
18 changes: 9 additions & 9 deletions Misc/HISTORY
Original file line number Diff line number Diff line change
Expand Up @@ -1834,7 +1834,7 @@ Core and Builtins
objects. Initial patch by Matthias Troffaes.

- Fix OSError.__init__ and OSError.__new__ so that each of them can be
overriden and take additional arguments (followup to issue #12555).
overridden and take additional arguments (followup to issue #12555).

- Fix the fix for issue #12149: it was incorrect, although it had the side
effect of appearing to resolve the issue. Thanks to Mark Shannon for
Expand Down Expand Up @@ -2053,7 +2053,7 @@ Core and Builtins
given, produce an informative error message which includes the name(s) of the
missing arguments.

- Issue #12370: Fix super with no arguments when __class__ is overriden in the
- Issue #12370: Fix super with no arguments when __class__ is overridden in the
class body.

- Issue #12084: os.stat on Windows now works properly with relative symbolic
Expand Down Expand Up @@ -7273,7 +7273,7 @@ Library
messages parsed by email.Parser.HeaderParser.

- Issue #7361: Importlib was not properly checking the number of bytes in
bytecode file when it was less then 8 bytes.
bytecode file when it was less than 8 bytes.

- Issue #7633: In the decimal module, Context class methods (with the exception
of canonical and is_canonical) now accept instances of int and long wherever a
Expand Down Expand Up @@ -7709,7 +7709,7 @@ Extension Modules

- Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly
compared to other unix systems. In particular, os.getgroups() does not reflect
any changes made using os.setgroups() but basicly always returns the same
any changes made using os.setgroups() but basically always returns the same
information as the id command. os.getgroups() can now return more than 16
groups on MacOSX.

Expand All @@ -7728,7 +7728,7 @@ Extension Modules
- Issue #1578269: Implement os.symlink for Windows 6.0+. Patch by Jason
R. Coombs.

- In struct.pack, correctly propogate exceptions from computing the truth of an
- In struct.pack, correctly propagate exceptions from computing the truth of an
object in the '?' format.

- Issue #9000: datetime.timezone objects now have eval-friendly repr.
Expand Down Expand Up @@ -8215,7 +8215,7 @@ Build
added LIBS to OS X framework builds.

- Issue #5809: Specifying both --enable-framework and --enable-shared is
an error. Configure now explicity tells you about this.
an error. Configure now explicitly tells you about this.



Expand Down Expand Up @@ -9209,7 +9209,7 @@ Library
been backported to help facilitate transitions from 2.7 to 3.1.

- Issue #1885: distutils. When running sdist with --formats=tar,gztar
the tar file was overriden by the gztar one.
the tar file was overridden by the gztar one.

- Issue #4863: distutils.mwerkscompiler has been removed.

Expand Down Expand Up @@ -10679,7 +10679,7 @@ Library

- Removed the 'new' module.

- Removed all types from the 'types' module that are easily accessable
- Removed all types from the 'types' module that are easily accessible
through builtins.


Expand Down Expand Up @@ -20921,7 +20921,7 @@ Fri Mar 26 22:36:00 1999 Fred Drake <fdrake@eric.cnri.reston.va.us>

* Tools/scripts/dutree.py:
During display, if EPIPE is raised, it's probably because a pager was
killed. Discard the error in that case, but propogate it otherwise.
killed. Discard the error in that case, but propagate it otherwise.

Fri Mar 26 16:20:45 1999 Guido van Rossum <guido@eric.cnri.reston.va.us>

Expand Down
4 changes: 2 additions & 2 deletions Misc/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -7141,8 +7141,8 @@ Library
error message has been removed. Patch by Ram Rachum.

- Issue #18080: When building a C extension module on OS X, if the compiler
is overriden with the CC environment variable, use the new compiler as
the default for linking if LDSHARED is not also overriden. This restores
is overridden with the CC environment variable, use the new compiler as
the default for linking if LDSHARED is not also overridden. This restores
Distutils behavior introduced in 3.2.3 and inadvertently dropped in 3.3.0.

- Issue #18113: Fixed a refcount leak in the curses.panel module's
Expand Down
4 changes: 2 additions & 2 deletions Modules/_datetimemodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@ format_utcoffset(char *buf, size_t buflen, const char *sep,
minutes = divmod(seconds, 60, &seconds);
hours = divmod(minutes, 60, &minutes);
assert(seconds == 0);
/* XXX ignore sub-minute data, curently not allowed. */
/* XXX ignore sub-minute data, currently not allowed. */
PyOS_snprintf(buf, buflen, "%c%02d%s%02d", sign, hours, sep, minutes);

return 0;
Expand Down Expand Up @@ -3304,7 +3304,7 @@ timezone_str(PyDateTime_TimeZone *self)
Py_DECREF(offset);
minutes = divmod(seconds, 60, &seconds);
hours = divmod(minutes, 60, &minutes);
/* XXX ignore sub-minute data, curently not allowed. */
/* XXX ignore sub-minute data, currently not allowed. */
assert(seconds == 0);
return PyUnicode_FromFormat("UTC%c%02d:%02d", sign, hours, minutes);
}
Expand Down
2 changes: 1 addition & 1 deletion Modules/_lzmamodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ _lzma.LZMACompressor.__init__
check: int(c_default="-1") = unspecified
The integrity check to use. For FORMAT_XZ, the default
is CHECK_CRC64. FORMAT_ALONE and FORMAT_RAW do not suport integrity
is CHECK_CRC64. FORMAT_ALONE and FORMAT_RAW do not support integrity
checks; for these formats, check must be omitted, or be CHECK_NONE.
preset: object = None
Expand Down
Loading

0 comments on commit e26da7c

Please sign in to comment.