diff options
| -rw-r--r-- | Doc/howto/logging-cookbook.rst | 2 | ||||
| -rw-r--r-- | Doc/reference/simple_stmts.rst | 2 | ||||
| -rw-r--r-- | Lib/http/cookiejar.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/ChangeLog | 2 | ||||
| -rw-r--r-- | Lib/test/test_descr.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_module.py | 2 | ||||
| -rw-r--r-- | Lib/tkinter/__init__.py | 4 | ||||
| -rw-r--r-- | Lib/urllib/robotparser.py | 2 | ||||
| -rwxr-xr-x | Mac/BuildScript/scripts/postflight.patch-profile | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst index 57b433398b..e784acca43 100644 --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -2231,7 +2231,7 @@ flushing behavior. The example script has a simple function, ``foo``, which just cycles through all the logging levels, writing to ``sys.stderr`` to say what level it's about -to log at, and then actually logging a message that that level. You can pass a +to log at, and then actually logging a message at that level. You can pass a parameter to ``foo`` which, if true, will log at ERROR and CRITICAL levels - otherwise, it only logs at DEBUG, INFO and WARNING levels. diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst index 5f605408b7..79a46e274a 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -237,7 +237,7 @@ Assignment of an object to a single target is recursively defined as follows. phase, causing less detailed error messages. Although the definition of assignment implies that overlaps between the -left-hand side and the right-hand side are 'simultanenous' (for example ``a, b = +left-hand side and the right-hand side are 'simultaneous' (for example ``a, b = b, a`` swaps two variables), overlaps *within* the collection of assigned-to variables occur left-to-right, sometimes resulting in confusion. For instance, the following program prints ``[0, 2]``:: diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py index bd367f94ca..265ccf99f2 100644 --- a/Lib/http/cookiejar.py +++ b/Lib/http/cookiejar.py @@ -1841,7 +1841,7 @@ def lwp_cookie_str(cookie): class LWPCookieJar(FileCookieJar): """ The LWPCookieJar saves a sequence of "Set-Cookie3" lines. - "Set-Cookie3" is the format used by the libwww-perl libary, not known + "Set-Cookie3" is the format used by the libwww-perl library, not known to be compatible with any browser, but which is easy to read and doesn't lose information about RFC 2965 cookies. diff --git a/Lib/idlelib/ChangeLog b/Lib/idlelib/ChangeLog index 90e02f6400..0c36664512 100644 --- a/Lib/idlelib/ChangeLog +++ b/Lib/idlelib/ChangeLog @@ -1574,7 +1574,7 @@ Mon Oct 12 23:59:27 1998 Guido van Rossum <guido@cnri.reston.va.us> * Attic/PopupMenu.py: Pass a root to the help window. * SearchBinding.py: - Add parent argument to 'to to line number' dialog box. + Add parent argument to 'go to line number' dialog box. Sat Oct 10 19:15:32 1998 Guido van Rossum <guido@cnri.reston.va.us> diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index a8206d3146..92767ec231 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -3489,7 +3489,7 @@ order (MRO) for bases """ b.a = a z = deepcopy(a) # This blew up before - def test_unintialized_modules(self): + def test_uninitialized_modules(self): # Testing uninitialized module objects... from types import ModuleType as M m = M.__new__(M) diff --git a/Lib/test/test_module.py b/Lib/test/test_module.py index 48ab0b4928..3a076b392a 100644 --- a/Lib/test/test_module.py +++ b/Lib/test/test_module.py @@ -30,7 +30,7 @@ class ModuleTests(unittest.TestCase): pass self.assertEqual(foo.__doc__, ModuleType.__doc__) - def test_unintialized_missing_getattr(self): + def test_uninitialized_missing_getattr(self): # Issue 8297 # test the text in the AttributeError of an uninitialized module foo = ModuleType.__new__(ModuleType) diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index be6ed7585b..82ac712dd2 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -1249,7 +1249,7 @@ class Misc: nsign, b, f, h, k, s, t, w, x, y, A, E, K, N, W, T, X, Y, D = args # Missing: (a, c, d, m, o, v, B, R) e = Event() - # serial field: valid vor all events + # serial field: valid for all events # number of button: ButtonPress and ButtonRelease events only # height field: Configure, ConfigureRequest, Create, # ResizeRequest, and Expose events only @@ -1261,7 +1261,7 @@ class Misc: # y field: "valid for events that contain a y field" # keysym as decimal: KeyPress and KeyRelease events only # x_root, y_root fields: ButtonPress, ButtonRelease, KeyPress, - # KeyRelease,and Motion events + # KeyRelease, and Motion events e.serial = getint(nsign) e.num = getint_event(b) try: e.focus = getboolean(f) diff --git a/Lib/urllib/robotparser.py b/Lib/urllib/robotparser.py index 4fbb0cb995..8b69fd985e 100644 --- a/Lib/urllib/robotparser.py +++ b/Lib/urllib/robotparser.py @@ -132,7 +132,7 @@ class RobotFileParser: return True # Until the robots.txt file has been read or found not # to exist, we must assume that no url is allowable. - # This prevents false positives when a user erronenously + # This prevents false positives when a user erroneously # calls can_fetch() before calling read(). if not self.last_checked: return False diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile index 36d0a3e40e..0a62e327f5 100755 --- a/Mac/BuildScript/scripts/postflight.patch-profile +++ b/Mac/BuildScript/scripts/postflight.patch-profile @@ -58,7 +58,7 @@ case "${BSH}" in fi echo "" >> "${RC}" echo "# Setting PATH for Python ${PYVER}" >> "${RC}" - echo "# The orginal version is saved in .cshrc.pysave" >> "${RC}" + echo "# The original version is saved in .cshrc.pysave" >> "${RC}" echo "set path=(${PYTHON_ROOT}/bin "'$path'")" >> "${RC}" if [ `id -ur` = 0 ]; then chown "${USER}" "${RC}" @@ -90,7 +90,7 @@ if [ -f "${PR}" ]; then fi echo "" >> "${PR}" echo "# Setting PATH for Python ${PYVER}" >> "${PR}" -echo "# The orginal version is saved in `basename ${PR}`.pysave" >> "${PR}" +echo "# The original version is saved in `basename ${PR}`.pysave" >> "${PR}" echo 'PATH="'"${PYTHON_ROOT}/bin"':${PATH}"' >> "${PR}" echo 'export PATH' >> "${PR}" if [ `id -ur` = 0 ]; then @@ -2674,7 +2674,7 @@ Library is run with pythonw.exe. - Issue #21775: shutil.copytree(): fix crash when copying to VFAT. An exception - handler assumed that that OSError objects always have a 'winerror' attribute. + handler assumed that OSError objects always have a 'winerror' attribute. That is not the case, so the exception handler itself raised AttributeError when run on Linux (and, presumably, any other non-Windows OS). Patch by Greg Ward. |