mirror of https://github.com/python/cpython
merge with 3.3
This commit is contained in:
commit
d8413bab22
2
.hgtags
2
.hgtags
|
@ -118,6 +118,8 @@ d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2
|
||||||
fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1
|
fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1
|
||||||
d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2
|
d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2
|
||||||
c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
|
c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
|
||||||
|
fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
|
||||||
|
7ff62415e4263c432c8acf6e424224209211eadb v3.3.4
|
||||||
46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
|
46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
|
||||||
9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
|
9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
|
||||||
dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3
|
dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3
|
||||||
|
|
|
@ -282,3 +282,4 @@ whatsnew/changelog,,:PythonCmd,"With Tk < 8.5 _tkinter.c:PythonCmd() raised Unic
|
||||||
whatsnew/changelog,,::,": Fix FTP tests for IPv6, bind to ""::1"" instead of ""localhost""."
|
whatsnew/changelog,,::,": Fix FTP tests for IPv6, bind to ""::1"" instead of ""localhost""."
|
||||||
whatsnew/changelog,,::,": Use ""127.0.0.1"" or ""::1"" instead of ""localhost"" as much as"
|
whatsnew/changelog,,::,": Use ""127.0.0.1"" or ""::1"" instead of ""localhost"" as much as"
|
||||||
whatsnew/changelog,,:password,user:password
|
whatsnew/changelog,,:password,user:password
|
||||||
|
whatsnew/changelog,,:gz,w:gz
|
||||||
|
|
|
|
@ -875,4 +875,3 @@ What's New in IDLEfork 0.9 Alpha 1?
|
||||||
--------------------------------------------------------------------
|
--------------------------------------------------------------------
|
||||||
Refer to HISTORY.txt for additional information on earlier releases.
|
Refer to HISTORY.txt for additional information on earlier releases.
|
||||||
--------------------------------------------------------------------
|
--------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,7 @@ SMTP_PORT = 25
|
||||||
SMTP_SSL_PORT = 465
|
SMTP_SSL_PORT = 465
|
||||||
CRLF = "\r\n"
|
CRLF = "\r\n"
|
||||||
bCRLF = b"\r\n"
|
bCRLF = b"\r\n"
|
||||||
|
_MAXLINE = 8192 # more than 8 times larger than RFC 821, 4.5.3
|
||||||
|
|
||||||
OLDSTYLE_AUTH = re.compile(r"auth=(.*)", re.I)
|
OLDSTYLE_AUTH = re.compile(r"auth=(.*)", re.I)
|
||||||
|
|
||||||
|
@ -365,7 +366,7 @@ class SMTP:
|
||||||
self.file = self.sock.makefile('rb')
|
self.file = self.sock.makefile('rb')
|
||||||
while 1:
|
while 1:
|
||||||
try:
|
try:
|
||||||
line = self.file.readline()
|
line = self.file.readline(_MAXLINE + 1)
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
self.close()
|
self.close()
|
||||||
raise SMTPServerDisconnected("Connection unexpectedly closed: "
|
raise SMTPServerDisconnected("Connection unexpectedly closed: "
|
||||||
|
@ -375,6 +376,8 @@ class SMTP:
|
||||||
raise SMTPServerDisconnected("Connection unexpectedly closed")
|
raise SMTPServerDisconnected("Connection unexpectedly closed")
|
||||||
if self.debuglevel > 0:
|
if self.debuglevel > 0:
|
||||||
print('reply:', repr(line), file=stderr)
|
print('reply:', repr(line), file=stderr)
|
||||||
|
if len(line) > _MAXLINE:
|
||||||
|
raise SMTPResponseException(500, "Line too long.")
|
||||||
resp.append(line[4:].strip(b' \t\r\n'))
|
resp.append(line[4:].strip(b' \t\r\n'))
|
||||||
code = line[:3]
|
code = line[:3]
|
||||||
# Check that the error code is syntactically correct.
|
# Check that the error code is syntactically correct.
|
||||||
|
|
|
@ -21,8 +21,13 @@ class MockFile:
|
||||||
"""
|
"""
|
||||||
def __init__(self, lines):
|
def __init__(self, lines):
|
||||||
self.lines = lines
|
self.lines = lines
|
||||||
def readline(self):
|
def readline(self, limit=-1):
|
||||||
return self.lines.pop(0) + b'\r\n'
|
result = self.lines.pop(0) + b'\r\n'
|
||||||
|
if limit >= 0:
|
||||||
|
# Re-insert the line, removing the \r\n we added.
|
||||||
|
self.lines.insert(0, result[limit:-2])
|
||||||
|
result = result[:limit]
|
||||||
|
return result
|
||||||
def close(self):
|
def close(self):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
|
@ -563,6 +563,33 @@ class BadHELOServerTests(unittest.TestCase):
|
||||||
HOST, self.port, 'localhost', 3)
|
HOST, self.port, 'localhost', 3)
|
||||||
|
|
||||||
|
|
||||||
|
@unittest.skipUnless(threading, 'Threading required for this test.')
|
||||||
|
class TooLongLineTests(unittest.TestCase):
|
||||||
|
respdata = b'250 OK' + (b'.' * smtplib._MAXLINE * 2) + b'\n'
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
self.old_stdout = sys.stdout
|
||||||
|
self.output = io.StringIO()
|
||||||
|
sys.stdout = self.output
|
||||||
|
|
||||||
|
self.evt = threading.Event()
|
||||||
|
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
|
self.sock.settimeout(15)
|
||||||
|
self.port = support.bind_port(self.sock)
|
||||||
|
servargs = (self.evt, self.respdata, self.sock)
|
||||||
|
threading.Thread(target=server, args=servargs).start()
|
||||||
|
self.evt.wait()
|
||||||
|
self.evt.clear()
|
||||||
|
|
||||||
|
def tearDown(self):
|
||||||
|
self.evt.wait()
|
||||||
|
sys.stdout = self.old_stdout
|
||||||
|
|
||||||
|
def testLineTooLong(self):
|
||||||
|
self.assertRaises(smtplib.SMTPResponseException, smtplib.SMTP,
|
||||||
|
HOST, self.port, 'localhost', 3)
|
||||||
|
|
||||||
|
|
||||||
sim_users = {'Mr.A@somewhere.com':'John A',
|
sim_users = {'Mr.A@somewhere.com':'John A',
|
||||||
'Ms.B@xn--fo-fka.com':'Sally B',
|
'Ms.B@xn--fo-fka.com':'Sally B',
|
||||||
'Mrs.C@somewhereesle.com':'Ruth C',
|
'Mrs.C@somewhereesle.com':'Ruth C',
|
||||||
|
@ -888,7 +915,8 @@ class SMTPSimTests(unittest.TestCase):
|
||||||
def test_main(verbose=None):
|
def test_main(verbose=None):
|
||||||
support.run_unittest(GeneralTests, DebuggingServerTests,
|
support.run_unittest(GeneralTests, DebuggingServerTests,
|
||||||
NonConnectingTests,
|
NonConnectingTests,
|
||||||
BadHELOServerTests, SMTPSimTests)
|
BadHELOServerTests, SMTPSimTests,
|
||||||
|
TooLongLineTests)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
test_main()
|
test_main()
|
||||||
|
|
Loading…
Reference in New Issue