merge with 3.3

diff --cc .hgtags
index 4e28f388f2d62efb2bd5b898eff349abc48a277b,8cbab4ed691e5eec45b6fe868f2d7a018ee67b37..e5d214033d225c4118ec9d532dd5bee9adb746ec
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -118,10 -118,5 +118,12 @@@ d047928ae3f6314a13b6137051315453d0ae89b
  fd53c500f8b80f54f3ecedec9da2e8c7e52a6888 v3.3.3rc1
  d32442c0e60dfbd71234e807d3d1dedd227495a9 v3.3.3rc2
  c3896275c0f61b2510a6c7e6c458a750359a91b8 v3.3.3
+ fa92f5f940c6c0d839d7f0611e4b717606504a3c v3.3.4rc1
+ 7ff62415e4263c432c8acf6e424224209211eadb v3.3.4
 +46535f65e7f3bcdcf176f36d34bc1fed719ffd2b v3.4.0a1
 +9265a2168e2cb2a84785d8717792acc661e6b692 v3.4.0a2
 +dd9cdf90a5073510877e9dd5112f8e6cf20d5e89 v3.4.0a3
 +e245b0d7209bb6d0e19316e1e2af1aa9c2139104 v3.4.0a4
 +3405dc9a6afaa0a06dd1f6f182ec5c998dce6f5f v3.4.0b1
 +ba32913eb13ec545a46dd0ce18035b6c416f0d78 v3.4.0b2
 +a97ce3ecc96af79bd2e1ac66ce48d9138e0ca749 v3.4.0b3

diff --cc Doc/tools/sphinxext/susp-ignored.csv
Simple merge

diff --cc Lib/idlelib/NEWS.txt
Simple merge

diff --cc Lib/smtplib.py
index 796b86612247e7f43f32ba89af14a66e7b760874,57f181b986d47b7e07e326486b5a61f3f5c4f2c6..66b5879defdca1f3dec0839db6211d8d6541d313
--- 1/Lib/smtplib.py
--- 2/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@@ -365,8 -365,8 +366,8 @@@ class SMTP
              self.file = self.sock.makefile('rb')
          while 1:
              try:
-                 line = self.file.readline()
+                 line = self.file.readline(_MAXLINE + 1)
 -            except socket.error as e:
 +            except OSError as e:
                  self.close()
                  raise SMTPServerDisconnected("Connection unexpectedly closed: "
                                               + str(e))

diff --cc Lib/test/mock_socket.py
Simple merge

diff --cc Lib/test/test_smtplib.py
Simple merge