summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJürgen Gmach <juergen.gmach@googlemail.com>2021-05-28 20:54:25 (GMT)
committerGitHub <noreply@github.com>2021-05-28 20:54:25 (GMT)
commit2138b2edaf5acb3b9c162a9ba620923e286239a8 (patch)
treec28af03f6d11fd3c3d66fd0eb940fc7b048da9a7
parentacac6c71ff370413374c6aca1df808c426e8a30c (diff)
downloadcpython-2138b2edaf5acb3b9c162a9ba620923e286239a8.zip
cpython-2138b2edaf5acb3b9c162a9ba620923e286239a8.tar.gz
cpython-2138b2edaf5acb3b9c162a9ba620923e286239a8.tar.bz2
bpo-44045: fix spelling of uppercase vs upper-case (GH-25985)
And also of lowercase vs lower-case. The `-` notation should only be used for adjectives.
-rw-r--r--Doc/library/builtins.rst2
-rw-r--r--Doc/library/msilib.rst2
-rw-r--r--Doc/library/poplib.rst2
-rw-r--r--Lib/imaplib.py2
-rw-r--r--Lib/ssl.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/builtins.rst b/Doc/library/builtins.rst
index 8fb1fef..7e4f8fe 100644
--- a/Doc/library/builtins.rst
+++ b/Doc/library/builtins.rst
@@ -25,7 +25,7 @@ that wants to implement an :func:`open` function that wraps the built-in
return UpperCaser(f)
class UpperCaser:
- '''Wrapper around a file that converts output to upper-case.'''
+ '''Wrapper around a file that converts output to uppercase.'''
def __init__(self, f):
self._f = f
diff --git a/Doc/library/msilib.rst b/Doc/library/msilib.rst
index 83b3d49..21a2a20 100644
--- a/Doc/library/msilib.rst
+++ b/Doc/library/msilib.rst
@@ -119,7 +119,7 @@ structures.
.. function:: gen_uuid()
Return a new UUID, in the format that MSI typically requires (i.e. in curly
- braces, and with all hexdigits in upper-case).
+ braces, and with all hexdigits in uppercase).
.. seealso::
diff --git a/Doc/library/poplib.rst b/Doc/library/poplib.rst
index 9bf9212..27202a1 100644
--- a/Doc/library/poplib.rst
+++ b/Doc/library/poplib.rst
@@ -118,7 +118,7 @@ One exception is defined as an attribute of the :mod:`poplib` module:
POP3 Objects
------------
-All POP3 commands are represented by methods of the same name, in lower-case;
+All POP3 commands are represented by methods of the same name, in lowercase;
most return the response text sent by the server.
An :class:`POP3` instance has the following methods:
diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 7318439..fa4c0f8 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -145,7 +145,7 @@ class IMAP4:
the global default socket timeout is used
All IMAP4rev1 commands are supported by methods of the same
- name (in lower-case).
+ name (in lowercase).
All arguments to commands are converted to strings, except for
AUTHENTICATE, and the last argument to APPEND which is passed as
diff --git a/Lib/ssl.py b/Lib/ssl.py
index 2b131de..aeb2958 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -280,7 +280,7 @@ CertificateError = SSLCertVerificationError
def _dnsname_match(dn, hostname):
"""Matching according to RFC 6125, section 6.4.3
- - Hostnames are compared lower case.
+ - Hostnames are compared lower-case.
- For IDNA, both dn and hostname must be encoded as IDN A-label (ACE).
- Partial wildcards like 'www*.example.org', multiple wildcards, sole
wildcard or wildcards in labels other then the left-most label are not