From 669ff66c326a0e5e0bed0619b691725f76ac3d04 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 28 Oct 2015 23:15:13 -0700 Subject: [PATCH] remove duplicated imports (closes #25502) --- Lib/getpass.py | 2 +- Lib/pickletools.py | 2 +- Lib/smtplib.py | 2 -- PC/testpy.py | 2 -- Parser/asdl_c.py | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Lib/getpass.py b/Lib/getpass.py index 7c4e976174a..be511211585 100644 --- a/Lib/getpass.py +++ b/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 = "" diff --git a/Lib/pickletools.py b/Lib/pickletools.py index cf5df4158a0..155bd5b4ab3 100644 --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -2793,7 +2793,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( diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 4fe6aaf8e12..7e348757f3e 100755 --- a/Lib/smtplib.py +++ b/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() diff --git a/PC/testpy.py b/PC/testpy.py index 36f92009a4f..4ef3d4f793d 100644 --- a/PC/testpy.py +++ b/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): diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index a5e35d93fd2..79e834b3dc8 100755 --- a/Parser/asdl_c.py +++ b/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 = ''