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.

diff --git a/Doc/library/builtins.rst b/Doc/library/builtins.rst
index 8fb1fef6da2954a37ed5794774602575c648c8ef..7e4f8fe0531567d0483e417bb9b56cb9b21a3a3e 100644 (file)
--- 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 83b3d4973bf0d96dc4880c2ff3581eced2f91c6d..21a2a205c39391a8bbdc8f8b3bd416cda2309c03 100644 (file)
--- 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 9bf9212d917a55d0dcc2ecb1c7051fd55072b1d6..27202a168e7c1724b574105fd93c497768e6e667 100644 (file)
--- 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 73184396d894a384b435e44204c4b8ff0163f4f6..fa4c0f8f62361a108f0001dc9f6abc0be2de6d01 100644 (file)
--- 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 2b131de04306acf94a834285087454b6957f27c2..aeb2958da24be07c71bad768ee539c7d146fa656 100644 (file)
--- 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