diff options
| -rw-r--r-- | Doc/library/pdb.rst | 2 | ||||
| -rw-r--r-- | Include/unicodeobject.h | 2 | ||||
| -rw-r--r-- | Lib/test/test_cmd_line.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_docxmlrpc.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_socket.py | 2 | ||||
| -rw-r--r-- | Lib/threading.py | 2 | ||||
| -rw-r--r-- | Lib/tkinter/ttk.py | 2 | ||||
| -rw-r--r-- | Misc/HISTORY | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Misc/coverity_model.c | 2 | ||||
| -rw-r--r-- | Objects/odictobject.c | 2 | ||||
| -rw-r--r-- | Objects/typeobject.c | 2 | ||||
| -rw-r--r-- | Python/ast.c | 2 | ||||
| -rwxr-xr-x | Tools/i18n/pygettext.py | 2 |
14 files changed, 15 insertions, 15 deletions
diff --git a/Doc/library/pdb.rst b/Doc/library/pdb.rst index 4520a9b..471d1ea 100644 --- a/Doc/library/pdb.rst +++ b/Doc/library/pdb.rst @@ -449,7 +449,7 @@ by the local file. .. pdbcommand:: interact - Start an interative interpreter (using the :mod:`code` module) whose global + Start an interactive interpreter (using the :mod:`code` module) whose global namespace contains all the (global and local) names found in the current scope. diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 1af620d..20b7037 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -2031,7 +2031,7 @@ PyAPI_FUNC(int) PyUnicode_CompareWithASCIIString( /* Rich compare two strings and return one of the following: - NULL in case an exception was raised - - Py_True or Py_False for successfully comparisons + - Py_True or Py_False for successful comparisons - Py_NotImplemented in case the type combination is unknown Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index 8faa8e1..87571d3 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -466,7 +466,7 @@ class CmdLineTest(unittest.TestCase): rc, out, err = assert_python_ok('-I', '-c', 'from sys import flags as f; ' 'print(f.no_user_site, f.ignore_environment, f.isolated)', - # dummyvar to prevent extranous -E + # dummyvar to prevent extraneous -E dummyvar="") self.assertEqual(out.strip(), b'1 1 1') with test.support.temp_cwd() as tmpdir: diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py index e6ca961..15a4ae2 100644 --- a/Lib/test/test_docxmlrpc.py +++ b/Lib/test/test_docxmlrpc.py @@ -164,7 +164,7 @@ class DocXMLRPCHTTPGETServer(unittest.TestCase): @make_request_and_skipIf(sys.flags.optimize >= 2, "Docstrings are omitted with -O2 and above") def test_system_methods(self): - """Test the precense of three consecutive system.* methods. + """Test the presence of three consecutive system.* methods. This also tests their use of parameter type recognition and the systems related to that process. diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index faacd61..7fce13e 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -708,7 +708,7 @@ class GeneralModuleTests(unittest.TestCase): raise socket.gaierror def testSendtoErrors(self): - # Testing that sendto doesn't masks failures. See #10169. + # Testing that sendto doesn't mask failures. See #10169. s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.addCleanup(s.close) s.bind(('', 0)) diff --git a/Lib/threading.py b/Lib/threading.py index d09fcae..4829ff4 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -641,7 +641,7 @@ class Barrier: self._break() raise - # Wait in the barrier until we are relased. Raise an exception + # Wait in the barrier until we are released. Raise an exception # if the barrier is reset or broken. def _wait(self, timeout): if not self._cond.wait_for(lambda : self._state != 0, timeout): diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py index 71ac2a7..c474e60 100644 --- a/Lib/tkinter/ttk.py +++ b/Lib/tkinter/ttk.py @@ -153,7 +153,7 @@ def _format_elemcreate(etype, script=False, *args, **kw): def _format_layoutlist(layout, indent=0, indent_size=2): """Formats a layout list so we can pass the result to ttk::style - layout and ttk::style settings. Note that the layout doesn't has to + layout and ttk::style settings. Note that the layout doesn't have to be a list necessarily. E.g.: diff --git a/Misc/HISTORY b/Misc/HISTORY index 06eb979..98e9041 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -1339,7 +1339,7 @@ Core and Builtins Library ------- -- Issue #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'. +- Issue #14768: os.path.expanduser('~/a') doesn't work correctly when HOME is '/'. - Issue #14371: Support bzip2 in zipfile module. Patch by Serhiy Storchaka. @@ -23970,7 +23970,7 @@ in Python. An example completer, rlcompleter.py, is provided. - The traceback.py module has a new function tb_lineno() by Marc-Andre Lemburg which extracts the line number from the linenumber table in -the code object. Apparently the traceback object doesn't contains the +the code object. Apparently the traceback object doesn't contain the right linenumber when -O is used. Rather than guessing whether -O is on or off, the module itself uses tb_lineno() unconditionally. @@ -8101,7 +8101,7 @@ Library on Windows and adds no value over and above python -m pydoc ... - Issue #18155: The csv module now correctly handles csv files that use - a delimter character that has a special meaning in regexes, instead of + a delimiter character that has a special meaning in regexes, instead of throwing an exception. - Issue #14360: encode_quopri can now be successfully used as an encoder diff --git a/Misc/coverity_model.c b/Misc/coverity_model.c index f776d76..089513a 100644 --- a/Misc/coverity_model.c +++ b/Misc/coverity_model.c @@ -30,7 +30,7 @@ typedef struct {} DIR; typedef struct {} RFILE; /* Python/pythonrun.c - * resourece leak false positive */ + * resource leak false positive */ void Py_FatalError(const char *msg) { __coverity_panic__(); diff --git a/Objects/odictobject.c b/Objects/odictobject.c index 9af0b0e..14be1cd 100644 --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -194,7 +194,7 @@ the concrete API. Here are some ways to address this challenge: 1. Change the relevant usage of the concrete API in CPython and add - PyDict_CheckExact() calls to each of the concrete API funcions. + PyDict_CheckExact() calls to each of the concrete API functions. 2. Adjust the relevant concrete API functions to explicitly accommodate OrderedDict. 3. As with #1, add the checks, but improve the abstract API with smart fast diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 683484a..b1686d2 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1504,7 +1504,7 @@ call_maybe(PyObject *o, _Py_Identifier *nameid, const char *format, ...) The next three properties are the 3 constraints in "C3". - Local precendece order. + Local precedence order. If A precedes B in C's MRO, then A will precede B in the MRO of all subclasses of C. diff --git a/Python/ast.c b/Python/ast.c index 8c13e0b..b56fadd 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -2852,7 +2852,7 @@ ast_for_expr_stmt(struct compiling *c, const node *n) testlist_star_expr: (test|star_expr) (',' test|star_expr)* [','] augassign: '+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>>=' | '**=' | '//=' - test: ... here starts the operator precendence dance + test: ... here starts the operator precedence dance */ if (NCH(n) == 1) { diff --git a/Tools/i18n/pygettext.py b/Tools/i18n/pygettext.py index be941c7..8ef5ff8 100755 --- a/Tools/i18n/pygettext.py +++ b/Tools/i18n/pygettext.py @@ -440,7 +440,7 @@ class TokenEater: '# File: %(filename)s, line: %(lineno)d') % d, file=fp) elif options.locationstyle == options.GNU: # fit as many locations on one line, as long as the - # resulting line length doesn't exceeds 'options.width' + # resulting line length doesn't exceed 'options.width' locline = '#:' for filename, lineno in v: d = {'filename': filename, 'lineno': lineno} |