[Python-checkins] r86381 - in python/branches/release31-maint: Lib/imaplib.py Lib/test/test_imaplib.py Misc/NEWS

antoine.pitrou python-checkins at python.org
Tue Nov 9 23:57:20 CET 2010


Author: antoine.pitrou
Date: Tue Nov  9 23:57:20 2010
New Revision: 86381

Log:
Merged revisions 86380 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86380 | antoine.pitrou | 2010-11-09 23:55:55 +0100 (mar., 09 nov. 2010) | 4 lines
  
  Fix IMAP.login() to work properly.
  Also, add remote tests for imaplib (part of #4471).
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/imaplib.py
   python/branches/release31-maint/Lib/test/test_imaplib.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/imaplib.py
==============================================================================
--- python/branches/release31-maint/Lib/imaplib.py	(original)
+++ python/branches/release31-maint/Lib/imaplib.py	Tue Nov  9 23:57:20 2010
@@ -1054,10 +1054,10 @@
 
     def _quote(self, arg):
 
-        arg = arg.replace(b'\\', b'\\\\')
-        arg = arg.replace(b'"', b'\\"')
+        arg = arg.replace('\\', '\\\\')
+        arg = arg.replace('"', '\\"')
 
-        return b'"' + arg + b'"'
+        return '"' + arg + '"'
 
 
     def _simple_command(self, name, *args):

Modified: python/branches/release31-maint/Lib/test/test_imaplib.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_imaplib.py	(original)
+++ python/branches/release31-maint/Lib/test/test_imaplib.py	Tue Nov  9 23:57:20 2010
@@ -13,7 +13,7 @@
 import sys
 import time
 
-from test.support import reap_threads, verbose
+from test.support import reap_threads, verbose, transient_internet
 import unittest
 
 try:
@@ -195,8 +195,45 @@
     imap_class = IMAP4_SSL
 
 
-def test_main():
+class RemoteIMAPTest(unittest.TestCase):
+    host = 'cyrus.andrew.cmu.edu'
+    port = 143
+    username = 'anonymous'
+    password = 'pass'
+    imap_class = imaplib.IMAP4
+
+    def setUp(self):
+        with transient_internet(self.host):
+            self.server = self.imap_class(self.host, self.port)
+
+    def tearDown(self):
+        if self.server is not None:
+            self.server.logout()
+
+    def test_logincapa(self):
+        self.assertTrue('LOGINDISABLED' in self.server.capabilities)
+
+    def test_anonlogin(self):
+        self.assertTrue('AUTH=ANONYMOUS' in self.server.capabilities)
+        rs = self.server.login(self.username, self.password)
+        self.assertEqual(rs[0], 'OK')
+
+    def test_logout(self):
+        rs = self.server.logout()
+        self.assertEqual(rs[0], 'BYE')
+
+
+ at unittest.skipUnless(ssl, "SSL not available")
+class RemoteIMAP_SSLTest(RemoteIMAPTest):
+    port = 993
+    imap_class = IMAP4_SSL
+
+    def test_logincapa(self):
+        self.assertFalse('LOGINDISABLED' in self.server.capabilities)
+        self.assertTrue('AUTH=PLAIN' in self.server.capabilities)
 
+
+def test_main():
     tests = [TestImaplib]
 
     if support.is_resource_enabled('network'):
@@ -206,7 +243,10 @@
                                     "keycert.pem")
             if not os.path.exists(CERTFILE):
                 raise support.TestFailed("Can't read certificate files!")
-        tests.extend([ThreadedNetworkedTests, ThreadedNetworkedTestsSSL])
+        tests.extend([
+            ThreadedNetworkedTests, ThreadedNetworkedTestsSSL,
+            RemoteIMAPTest, RemoteIMAP_SSLTest,
+        ])
 
     support.run_unittest(*tests)
 

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Nov  9 23:57:20 2010
@@ -143,6 +143,8 @@
 Library
 -------
 
+- Fix IMAP.login() to work properly.
+
 - Issue #10126: Fix distutils' test_build when Python was built with
   --enable-shared.
   


More information about the Python-checkins mailing list