merge 3.5 (#25502) · pythoncapi/cpython@860c8a4 · GitHub
Skip to content

Commit 860c8a4

Browse files
benjaminpbenjaminp
committed
merge 3.5 (python#25502)
2 parents 2e0e18b + 669ff66 commit 860c8a4

5 files changed

Lines changed: 2 additions & 7 deletions

File tree

‎Lib/getpass.py‎

Lines changed: 1 addition & 1 deletion

‎Lib/pickletools.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2794,7 +2794,7 @@ def _test():
27942794
return doctest.testmod()
27952795

27962796
if __name__ == "__main__":
2797-
import sys, argparse
2797+
import argparse
27982798
parser = argparse.ArgumentParser(
27992799
description='disassemble one or more pickle files')
28002800
parser.add_argument(

‎Lib/smtplib.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,8 +1080,6 @@ def connect(self, host='localhost', port=0, source_address=None):
10801080
# Test the sendmail method, which tests most of the others.
10811081
# Note: This always sends to localhost.
10821082
if __name__ == '__main__':
1083-
import sys
1084-
10851083
def prompt(prompt):
10861084
sys.stdout.write(prompt + ": ")
10871085
sys.stdout.flush()

‎PC/testpy.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
a PC, you should add the dos_8x3 directory to your PYTHONPATH.""")
1919
sys.exit(1)
2020

21-
import os
22-
2321
for dir in sys.path:
2422
file = os.path.join(dir, "os.py")
2523
if os.path.isfile(file):

‎Parser/asdl_c.py‎

Lines changed: 0 additions & 1 deletion

0 commit comments

Comments
 (0)