5 files changed, 6 insertions, 30 deletions
diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst
index 8840fc7..7e0cb9c 100644
--- a/Doc/library/crypt.rst
+++ b/Doc/library/crypt.rst
@@ -47,14 +47,8 @@ A simple example illustrating typical use::
 
    import crypt, getpass, pwd
 
-   def raw_input(prompt):
-       import sys
-       sys.stdout.write(prompt)
-       sys.stdout.flush()
-       return sys.stdin.readline()
-
    def login():
-       username = raw_input('Python login:')
+       username = input('Python login:')
        cryptedpasswd = pwd.getpwnam(username)[1]
        if cryptedpasswd:
            if cryptedpasswd == 'x' or cryptedpasswd == '*': 
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
index 0653a50..790cacb 100644
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -306,14 +306,8 @@ example doesn't do any processing of the :rfc:`822` headers.  In particular, the
 
    import smtplib
 
-   def raw_input(prompt):
-       import sys
-       sys.stdout.write(prompt)
-       sys.stdout.flush()
-       return sys.stdin.readline()
-
    def prompt(prompt):
-       return raw_input(prompt).strip()
+       return input(prompt).strip()
 
    fromaddr = prompt("From: ")
    toaddrs  = prompt("To: ").split()
@@ -324,7 +318,7 @@ example doesn't do any processing of the :rfc:`822` headers.  In particular, the
           % (fromaddr, ", ".join(toaddrs)))
    while True:
        try:
-           line = raw_input()
+           line = input()
        except EOFError:
            break
        if not line:
diff --git a/Doc/library/telnetlib.rst b/Doc/library/telnetlib.rst
index 5cfca9a..7f08e70 100644
--- a/Doc/library/telnetlib.rst
+++ b/Doc/library/telnetlib.rst
@@ -211,16 +211,10 @@ Telnet Example
 A simple example illustrating typical use::
 
    import getpass
-   import sys
    import telnetlib
 
-   def raw_input(prompt):
-       sys.stdout.write(prompt)
-       sys.stdout.flush()
-       return sys.stdin.readline()
-
    HOST = "localhost"
-   user = raw_input("Enter your remote account: ")
+   user = input("Enter your remote account: ")
    password = getpass.getpass()
 
    tn = telnetlib.Telnet(HOST)
diff --git a/Doc/library/termios.rst b/Doc/library/termios.rst
index 695faad..54fb065 100644
--- a/Doc/library/termios.rst
+++ b/Doc/library/termios.rst
@@ -90,12 +90,6 @@ technique using a separate :func:`tcgetattr` call and a :keyword:`try` ...
 :keyword:`finally` statement to ensure that the old tty attributes are restored
 exactly no matter what happens::
 
-   def raw_input(prompt):
-       import sys
-       sys.stdout.write(prompt)
-       sys.stdout.flush()
-       return sys.stdin.readline()
-
    def getpass(prompt = "Password: "):
        import termios, sys
        fd = sys.stdin.fileno()
@@ -104,7 +98,7 @@ exactly no matter what happens::
        new[3] = new[3] & ~termios.ECHO          # lflags
        try:
            termios.tcsetattr(fd, termios.TCSADRAIN, new)
-           passwd = raw_input(prompt)
+           passwd = input(prompt)
        finally:
            termios.tcsetattr(fd, termios.TCSADRAIN, old)
        return passwd
diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst
index 9b96743..ca8aea3 100644
--- a/Doc/library/traceback.rst
+++ b/Doc/library/traceback.rst
@@ -143,7 +143,7 @@ module. ::
    import sys, traceback
 
    def run_user_code(envdir):
-       source = raw_input(">>> ")
+       source = input(">>> ")
        try:
            exec(source, envdir)
        except: