Remove string.{letters,lowercase,uppercase}.

8 files changed, 17 insertions, 46 deletions

diff --git a/Doc/lib/libstring.tex b/Doc/lib/libstring.tex
index 055ac0cf1b..9948cb74a3 100644
--- a/Doc/lib/libstring.tex
+++ b/Doc/lib/libstring.tex
@@ -13,18 +13,18 @@ functions based on regular expressions.
 
 The constants defined in this module are:
 
-\begin{datadesc}{ascii_letters}
+\begin{datadesc}{ascii\_letters}
   The concatenation of the \constant{ascii_lowercase} and
   \constant{ascii_uppercase} constants described below.  This value is
   not locale-dependent.
 \end{datadesc}
 
-\begin{datadesc}{ascii_lowercase}
+\begin{datadesc}{ascii\_lowercase}
   The lowercase letters \code{'abcdefghijklmnopqrstuvwxyz'}.  This
   value is not locale-dependent and will not change.
 \end{datadesc}
 
-\begin{datadesc}{ascii_uppercase}
+\begin{datadesc}{ascii\_uppercase}
   The uppercase letters \code{'ABCDEFGHIJKLMNOPQRSTUVWXYZ'}.  This
   value is not locale-dependent and will not change.
 \end{datadesc}
@@ -37,23 +37,6 @@ The constants defined in this module are:
   The string \code{'0123456789abcdefABCDEF'}.
 \end{datadesc}
 
-\begin{datadesc}{letters}
-  The concatenation of the strings \constant{lowercase} and
-  \constant{uppercase} described below.  The specific value is
-  locale-dependent, and will be updated when
-  \function{locale.setlocale()} is called.
-\end{datadesc}
-
-\begin{datadesc}{lowercase}
-  A string containing all the characters that are considered lowercase
-  letters.  On most systems this is the string
-  \code{'abcdefghijklmnopqrstuvwxyz'}.  Do not change its definition ---
-  the effect on the routines \function{upper()} and
-  \function{swapcase()} is undefined.  The specific value is
-  locale-dependent, and will be updated when
-  \function{locale.setlocale()} is called.
-\end{datadesc}
-
 \begin{datadesc}{octdigits}
   The string \code{'01234567'}.
 \end{datadesc}
@@ -69,16 +52,6 @@ The constants defined in this module are:
   \constant{punctuation}, and \constant{whitespace}.
 \end{datadesc}
 
-\begin{datadesc}{uppercase}
-  A string containing all the characters that are considered uppercase
-  letters.  On most systems this is the string
-  \code{'ABCDEFGHIJKLMNOPQRSTUVWXYZ'}.  Do not change its definition ---
-  the effect on the routines \function{lower()} and
-  \function{swapcase()} is undefined.  The specific value is
-  locale-dependent, and will be updated when
-  \function{locale.setlocale()} is called.
-\end{datadesc}
-
 \begin{datadesc}{whitespace}
   A string containing all characters that are considered whitespace.
   On most systems this includes the characters space, tab, linefeed,
diff --git a/Lib/string.py b/Lib/string.py
index 51b2067ab9..87073aab4d 100644
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -16,17 +16,14 @@ printable -- a string containing all characters considered printable
 
 # Some strings for ctype-style character classification
 whitespace = ' \t\n\r\v\f'
-lowercase = 'abcdefghijklmnopqrstuvwxyz'
-uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-letters = lowercase + uppercase
-ascii_lowercase = lowercase
-ascii_uppercase = uppercase
+ascii_lowercase = 'abcdefghijklmnopqrstuvwxyz'
+ascii_uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 ascii_letters = ascii_lowercase + ascii_uppercase
 digits = '0123456789'
 hexdigits = digits + 'abcdef' + 'ABCDEF'
 octdigits = '01234567'
 punctuation = """!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
-printable = digits + letters + punctuation + whitespace
+printable = digits + ascii_letters + punctuation + whitespace
 
 # Case conversion helpers
 # Use str to convert Unicode literal in case of -U
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index 21cc408080..7ac52e3538 100644
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -645,7 +645,7 @@ class TestArrayWrites(unittest.TestCase):
 
     def test_char_write(self):
         import array, string
-        a = array.array('u', string.letters)
+        a = array.array('u', string.ascii_letters)
 
         with TemporaryFile("w+b") as fileobj:
             writer = csv.writer(fileobj, dialect="excel")
diff --git a/Lib/test/test_pkgimport.py b/Lib/test/test_pkgimport.py
index 8b5e3adf28..789f4d33ae 100644
--- a/Lib/test/test_pkgimport.py
+++ b/Lib/test/test_pkgimport.py
@@ -7,7 +7,7 @@ class TestImport(unittest.TestCase):
     def __init__(self, *args, **kw):
         self.package_name = 'PACKAGE_'
         while self.package_name in sys.modules:
-            self.package_name += random.choose(string.letters)
+            self.package_name += random.choose(string.ascii_letters)
         self.module_name = self.package_name + '.foo'
         unittest.TestCase.__init__(self, *args, **kw)
 
@@ -58,7 +58,7 @@ class TestImport(unittest.TestCase):
         # ...make up a variable name that isn't bound in __builtins__
         var = 'a'
         while var in dir(__builtins__):
-            var += random.choose(string.letters)
+            var += random.choose(string.ascii_letters)
 
         # ...make a module that just contains that
         self.rewrite_file(var)
diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
index ab75f8c50b..3b21ebc854 100644
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -6,9 +6,9 @@ class ModuleTest(unittest.TestCase):
 
     def test_attrs(self):
         string.whitespace
-        string.lowercase
-        string.uppercase
-        string.letters
+        string.ascii_lowercase
+        string.ascii_uppercase
+        string.ascii_letters
         string.digits
         string.hexdigits
         string.octdigits
diff --git a/Misc/NEWS b/Misc/NEWS
index b5a67db22d..342ca2fc5e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -202,7 +202,8 @@ Library
 - Remove obsolete functions:
   * commands.getstatus(), os.popen*,
 
-- Remove functions in the string module that are also string methods.
+- Remove functions in the string module that are also string methods;
+  Remove string.{letters, lowercase, uppercase}.
 
 - Remove support for long obsolete platforms: plat-aix3, plat-irix5.
 
diff --git a/Tools/modulator/modulator.py b/Tools/modulator/modulator.py
index a06306bc3b..d4b851075e 100755
--- a/Tools/modulator/modulator.py
+++ b/Tools/modulator/modulator.py
@@ -30,8 +30,8 @@ import string
 
 oops = 'oops'
 
-IDENTSTARTCHARS = string.letters + '_'
-IDENTCHARS = string.letters + string.digits + '_'
+IDENTSTARTCHARS = string.ascii_letters + '_'
+IDENTCHARS = string.ascii_letters + string.digits + '_'
 
 # Check that string is a legal C identifier
 def checkid(str):
diff --git a/Tools/scripts/texi2html.py b/Tools/scripts/texi2html.py
index e5e292d20d..37d6e9168c 100755
--- a/Tools/scripts/texi2html.py
+++ b/Tools/scripts/texi2html.py
@@ -2000,7 +2000,7 @@ def fixfunnychars(addr):
 def increment(s):
     if not s:
         return '1'
-    for sequence in string.digits, string.lowercase, string.uppercase:
+    for sequence in string.digits, string.ascii_lowercase, string.ascii_uppercase:
         lastc = s[-1]
         if lastc in sequence:
             i = sequence.index(lastc) + 1