merge 3.5 (#25502)

Lib/getpass.py

@@ -99,7 +99,7 @@ def win_getpass(prompt='Password: ', stream=None):
     """Prompt for password with echo off, using Windows getch()."""
     if sys.stdin is not sys.__stdin__:
         return fallback_getpass(prompt, stream)
-    import msvcrt
+
     for c in prompt:
         msvcrt.putwch(c)
     pw = ""

Lib/pickletools.py

@@ -2794,7 +2794,7 @@ def _test():
     return doctest.testmod()
 
 if __name__ == "__main__":
-    import sys, argparse
+    import argparse
     parser = argparse.ArgumentParser(
         description='disassemble one or more pickle files')
     parser.add_argument(

Lib/smtplib.py

@@ -1080,8 +1080,6 @@ class LMTP(SMTP):
 # Test the sendmail method, which tests most of the others.
 # Note: This always sends to localhost.
 if __name__ == '__main__':
-    import sys
-
     def prompt(prompt):
         sys.stdout.write(prompt + ": ")
         sys.stdout.flush()

PC/testpy.py

@@ -18,8 +18,6 @@ except:
   a PC, you should add the dos_8x3 directory to your PYTHONPATH.""")
     sys.exit(1)
 
-import os
-
 for dir in sys.path:
     file = os.path.join(dir, "os.py")
     if os.path.isfile(file):

Parser/asdl_c.py

@@ -1289,7 +1289,6 @@ def main(srcfile, dump_module=False):
         f.close()
 
 if __name__ == "__main__":
-    import sys
     import getopt
 
     INC_DIR = ''