From: Martin Panter Date: Thu, 28 Jul 2016 02:37:04 +0000 (+0000) Subject: Spelling and grammar fixes in code comments and documentation X-Git-Tag: v2.7.13rc1~228 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d36f0f712e8a720e66808e2b634aace11c6bb88;p=python Spelling and grammar fixes in code comments and documentation --- diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 9184eb100b..9ac73d46fb 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1138,7 +1138,7 @@ PyAPI_FUNC(int) PyUnicode_EncodeDecimal( These are capable of handling Unicode objects and strings on input (we refer to them as strings in the descriptions) and return - Unicode objects or integers as apporpriate. */ + Unicode objects or integers as appropriate. */ /* Concat two strings giving a new Unicode string. */ @@ -1288,7 +1288,7 @@ PyAPI_FUNC(int) PyUnicode_Compare( /* Rich compare two strings and return one of the following: - NULL in case an exception was raised - - Py_True or Py_False for successfuly 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/lib-tk/ttk.py b/Lib/lib-tk/ttk.py index 3f6f79b91a..11254391c0 100644 --- a/Lib/lib-tk/ttk.py +++ b/Lib/lib-tk/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/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py index a1a1fcf8bc..815b6806d0 100644 --- a/Lib/test/test_docxmlrpc.py +++ b/Lib/test/test_docxmlrpc.py @@ -153,7 +153,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 d784aeade8..765d7c0c1e 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -299,7 +299,7 @@ class GeneralModuleTests(unittest.TestCase): "Error raising socket exception.") 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/Misc/HISTORY b/Misc/HISTORY index 73efb3e7a0..a2f58413b0 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -13058,7 +13058,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. diff --git a/Misc/NEWS b/Misc/NEWS index 8378cfba9e..0aa7ee87c4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -3506,7 +3506,7 @@ Library - Issue #14157: Fix time.strptime failing without a year on February 29th. Patch by Hynek Schlawack. -- 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 #13183: Fix pdb skipping frames after hitting a breakpoint and running step. Patch by Xavier de Gaye. diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 342b2dbded..4e5d917a68 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -901,7 +901,7 @@ string_print(PyStringObject *op, FILE *fp, int flags) fputc(quote, fp); for (i = 0; i < str_len; i++) { /* Since strings are immutable and the caller should have a - reference, accessing the interal buffer should not be an issue + reference, accessing the internal buffer should not be an issue with the GIL released. */ c = op->ob_sval[i]; if (c == quote || c == '\\') diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 438c70b45a..ee0921ac00 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1379,7 +1379,7 @@ classic_mro(PyObject *cls) 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/Parser/asdl_c.py b/Parser/asdl_c.py index 7ebc2369e3..3d46220300 100755 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -136,7 +136,7 @@ class TypeDefVisitor(EmitVisitor): class StructVisitor(EmitVisitor): - """Visitor to generate typdefs for AST.""" + """Visitor to generate typedefs for AST.""" def visitModule(self, mod): for dfn in mod.dfns: diff --git a/Python/ast.c b/Python/ast.c index e5d7ac6600..2b7aed808b 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -2179,7 +2179,7 @@ ast_for_expr_stmt(struct compiling *c, const node *n) testlist: test (',' test)* [','] 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 af24b471a9..a62d2fe441 100755 --- a/Tools/i18n/pygettext.py +++ b/Tools/i18n/pygettext.py @@ -482,7 +482,7 @@ class TokenEater: '# File: %(filename)s, line: %(lineno)d') % d 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}