diff options
| -rw-r--r-- | Doc/library/asyncio-protocol.rst | 4 | ||||
| -rw-r--r-- | Doc/library/contextvars.rst | 2 | ||||
| -rw-r--r-- | Doc/library/datetime.rst | 4 | ||||
| -rw-r--r-- | Doc/library/test.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/3.7.rst | 2 | ||||
| -rw-r--r-- | Lib/asyncio/protocols.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/idle_test/test_editmenu.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/idle_test/test_text.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-01-18-13-09-00.bpo-32585.qpeijr.rst | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-03-18-17-38-48.bpo-32953.t8WAWN.rst | 2 | ||||
| -rw-r--r-- | Modules/_datetimemodule.c | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst index 004cac8..ef64416 100644 --- a/Doc/library/asyncio-protocol.rst +++ b/Doc/library/asyncio-protocol.rst @@ -339,7 +339,7 @@ Protocol classes control of the receive buffer. .. versionadded:: 3.7 - **Important:** this has been been added to asyncio in Python 3.7 + **Important:** this has been added to asyncio in Python 3.7 *on a provisional basis*! Treat it as an experimental API that might be changed or removed in Python 3.8. @@ -450,7 +450,7 @@ Streaming protocols with manual receive buffer control ------------------------------------------------------ .. versionadded:: 3.7 - **Important:** :class:`BufferedProtocol` has been been added to + **Important:** :class:`BufferedProtocol` has been added to asyncio in Python 3.7 *on a provisional basis*! Consider it as an experimental API that might be changed or removed in Python 3.8. diff --git a/Doc/library/contextvars.rst b/Doc/library/contextvars.rst index 1e0987c..abd0d5f 100644 --- a/Doc/library/contextvars.rst +++ b/Doc/library/contextvars.rst @@ -253,7 +253,7 @@ client:: addr = writer.transport.get_extra_info('socket').getpeername() client_addr_var.set(addr) - # In any code that we call is is now possible to get + # In any code that we call is now possible to get # client's address by calling 'client_addr_var.get()'. while True: diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index c1b164e..8d91f4e 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -2209,8 +2209,8 @@ Notes: :meth:`utcoffset` is transformed into a string of the form ±HHMM[SS[.uuuuuu]], where HH is a 2-digit string giving the number of UTC offset hours, and MM is a 2-digit string giving the number of UTC offset - minutes, SS is a 2-digit string string giving the number of UTC offset - seconds and uuuuuu is a 2-digit string string giving the number of UTC + minutes, SS is a 2-digit string giving the number of UTC offset + seconds and uuuuuu is a 2-digit string giving the number of UTC offset microseconds. The uuuuuu part is omitted when the offset is a whole number of minutes and both the uuuuuu and the SS parts are omitted when the offset is a whole number of minutes. For example, if diff --git a/Doc/library/test.rst b/Doc/library/test.rst index 0746fcf..7b0971a 100644 --- a/Doc/library/test.rst +++ b/Doc/library/test.rst @@ -1153,7 +1153,7 @@ The :mod:`test.support` module defines the following functions: *module*. The *name_of_module* argument can specify (as a string or tuple thereof) what - module(s) an API could be defined in in order to be detected as a public + module(s) an API could be defined in order to be detected as a public API. One case for this is when *module* imports part of its public API from other modules, possibly a C backend (like ``csv`` and its ``_csv``). diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst index e0c19cf..1f52488 100644 --- a/Doc/whatsnew/3.7.rst +++ b/Doc/whatsnew/3.7.rst @@ -684,7 +684,7 @@ feature. Instances must be created with :class:`~ssl.SSLContext` methods (Contributed by Christian Heimes in :issue:`32951`) OpenSSL 1.1 APIs for setting the minimum and maximum TLS protocol version are -available as as :attr:`~ssl.SSLContext.minimum_version` and +available as :attr:`~ssl.SSLContext.minimum_version` and :attr:`~ssl.SSLContext.maximum_version`. Supported protocols are indicated by new flags like :data:`~ssl.HAS_TLSv1_1`. (Contributed by Christian Heimes in :issue:`32609`.) diff --git a/Lib/asyncio/protocols.py b/Lib/asyncio/protocols.py index 8904478..dc298a8 100644 --- a/Lib/asyncio/protocols.py +++ b/Lib/asyncio/protocols.py @@ -105,7 +105,7 @@ class Protocol(BaseProtocol): class BufferedProtocol(BaseProtocol): """Interface for stream protocol with manual buffer control. - Important: this has been been added to asyncio in Python 3.7 + Important: this has been added to asyncio in Python 3.7 *on a provisional basis*! Consider it as an experimental API that might be changed or removed in Python 3.8. diff --git a/Lib/idlelib/idle_test/test_editmenu.py b/Lib/idlelib/idle_test/test_editmenu.py index 17eb25c..1747847 100644 --- a/Lib/idlelib/idle_test/test_editmenu.py +++ b/Lib/idlelib/idle_test/test_editmenu.py @@ -1,6 +1,6 @@ '''Test (selected) IDLE Edit menu items. -Edit modules have their own test files files +Edit modules have their own test files ''' from test.support import requires requires('gui') diff --git a/Lib/idlelib/idle_test/test_text.py b/Lib/idlelib/idle_test/test_text.py index a5ba7bb..0f31179 100644 --- a/Lib/idlelib/idle_test/test_text.py +++ b/Lib/idlelib/idle_test/test_text.py @@ -9,7 +9,7 @@ from _tkinter import TclError class TextTest(object): "Define items common to both sets of tests." - hw = 'hello\nworld' # Several tests insert this after after initialization. + hw = 'hello\nworld' # Several tests insert this after initialization. hwn = hw+'\n' # \n present at initialization, before insert # setUpClass defines cls.Text and maybe cls.root. diff --git a/Misc/NEWS.d/next/Library/2018-01-18-13-09-00.bpo-32585.qpeijr.rst b/Misc/NEWS.d/next/Library/2018-01-18-13-09-00.bpo-32585.qpeijr.rst index c504e8b..0a60204 100644 --- a/Misc/NEWS.d/next/Library/2018-01-18-13-09-00.bpo-32585.qpeijr.rst +++ b/Misc/NEWS.d/next/Library/2018-01-18-13-09-00.bpo-32585.qpeijr.rst @@ -1 +1 @@ -Add Ttk spinbox widget to to tkinter.ttk. Patch by Alan D Moore. +Add Ttk spinbox widget to :mod:`tkinter.ttk`. Patch by Alan D Moore. diff --git a/Misc/NEWS.d/next/Library/2018-03-18-17-38-48.bpo-32953.t8WAWN.rst b/Misc/NEWS.d/next/Library/2018-03-18-17-38-48.bpo-32953.t8WAWN.rst index fbea34a..03c1162 100644 --- a/Misc/NEWS.d/next/Library/2018-03-18-17-38-48.bpo-32953.t8WAWN.rst +++ b/Misc/NEWS.d/next/Library/2018-03-18-17-38-48.bpo-32953.t8WAWN.rst @@ -1,4 +1,4 @@ If a non-dataclass inherits from a frozen dataclass, allow attributes to be -added to the derived class. Only attributes from from the frozen dataclass +added to the derived class. Only attributes from the frozen dataclass cannot be assigned to. Require all dataclasses in a hierarchy to be either all frozen or all non-frozen. diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index b69fcdf..6855903 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -5214,7 +5214,7 @@ get_flip_fold_offset(PyObject *dt) /* PEP 495 exception: Whenever one or both of the operands in * inter-zone comparison is such that its utcoffset() depends - * on the value of its fold fold attribute, the result is False. + * on the value of its fold attribute, the result is False. * * Return 1 if exception applies, 0 if not, and -1 on error. */ |