Revert r63934 -- it was mixing two patches.

5 files changed, 9 insertions, 26 deletions

diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index 07b215d..17c25d5 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -144,13 +144,6 @@ the Python configuration.
 
    Return 1 or 0 depending on whether *ch* is an alphanumeric character.
 
-.. cfunction:: int Py_UNICODE_ISPRINTABLE(Py_UNICODE ch)
-
-   Return 1 or 0 depending on whether *ch* is a printable character.
-   Characters defined in the Unicode character database as "Other"
-   or "Separator" other than ASCII space(0x20) are not considered
-   printable.
-
 These APIs can be used for fast direct character conversions:
 
 
@@ -235,9 +228,6 @@ APIs:
    +===================+=====================+================================+
    | :attr:`%%`        | *n/a*               | The literal % character.       |
    +-------------------+---------------------+--------------------------------+
-   | :attr:`%a`        | PyObject\*          | The result of calling          |
-   |                   |                     | :func:`ascii`.                 |
-   +-------------------+---------------------+--------------------------------+
    | :attr:`%c`        | int                 | A single character,            |
    |                   |                     | represented as an C int.       |
    +-------------------+---------------------+--------------------------------+
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index a3c456c..875eea0 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -91,14 +91,6 @@ are always available.  They are listed here in alphabetical order.
           return False
 
 
-.. function:: ascii(object)
-
-   As :func:`repr`, return a string containing a printable
-   representation of an object. But unlike :func:`repr`, the non-ASCII
-   characters in the string returned by :func:`ascii`() are hex-escaped
-   to generate a same string as :func:`repr` in Python 2.
-
-
 .. function:: bin(x)
 
    Convert an integer number to a binary string. The result is a valid Python
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index bccc02a..09549ad 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -774,14 +774,6 @@ functions based on regular expressions.
    least one cased character, false otherwise.
 
 
-.. method:: str.isprintable()
-
-   Return true if all characters in the string are printable and there is at
-   least one character, false otherwise. Characters defined in the Unicode 
-   character database as "Other" or "Separator" other than ASCII space(0x20) are 
-   not considered printable.
-
-
 .. method:: str.isspace()
 
    Return true if there are only whitespace characters in the string and there is
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index b354603..0929f0e 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -231,6 +231,8 @@ always available.
    +------------------------------+------------------------------------------+
    | :const:`ignore_environment`  | -E                                       |
    +------------------------------+------------------------------------------+
+   | :const:`tabcheck`            | -t or -tt                                |
+   +------------------------------+------------------------------------------+
    | :const:`verbose`             | -v                                       |
    +------------------------------+------------------------------------------+
    | :const:`unicode`             | -U                                       |
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 5100c21..a6a6ecf 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -222,6 +222,13 @@ Miscellaneous options
    manipulations of :data:`sys.path` that it entails.
 
 
+.. cmdoption:: -t
+
+   Issue a warning when a source file mixes tabs and spaces for indentation in a
+   way that makes it depend on the worth of a tab expressed in spaces.  Issue an
+   error when the option is given twice (:option:`-tt`).
+
+
 .. cmdoption:: -u
    
    Force stdin, stdout and stderr to be totally unbuffered.  On systems where it