Merged default into stable

--HG--
branch : stable

Author: Menno Smits

THANKS

@@ -60,6 +60,8 @@ Thomas Steinacher
 Eben Freeman
      ID support
 
+Aviv Salem
+     PLAIN authentication support
 
 Bug Reports
 ------------

doc/src/index.rst

@@ -29,7 +29,7 @@ explains IMAP in detail. Other RFCs also apply to various extensions
 to the base protocol. These are referred to in the documentation below
 where relevant.
 
-Python versions 2.6, 2.7, 3.3 and 3.4 are officially supported.
+Python versions 2.6, 2.7, 3.3, 3.4 and 3.5 are officially supported.
 
 A Simple Example
 ----------------

doc/src/releases.rst

@@ -1,5 +1,13 @@
 :tocdepth: 1
 
+===============
+ Version 1.1.0
+===============
+
+Added
+-----
+- PLAIN authentication support (via `plain_login` method)
+
 ===============
  Version 1.0.2
 ===============

imapclient/imapclient.py

@@ -241,6 +241,14 @@ def oauth2_login(self, user, access_token, mech='XOAUTH2', vendor=None):
         auth_string += '\1'
         return self._command_and_check('authenticate', mech, lambda x: auth_string)
 
+    def plain_login(self, identity, password, authorization_identity=None):
+        """Authenticate using the PLAIN method (requires server support).
+        """
+        if not authorization_identity:
+            authorization_identity = ""
+        auth_string = '%s\0%s\0%s' % (authorization_identity, identity, password)
+        return self._command_and_check('authenticate', 'PLAIN', lambda _: auth_string, unpack=True)
+
     def logout(self):
         """Logout, returning the server response.
         """

imapclient/response_types.py

@@ -19,7 +19,7 @@ class Envelope(namedtuple("Envelope", "date subject from_ sender reply_to to " +
 
     :ivar date: A datetime instance that represents the "Date" header.
     :ivar subject: A string that contains the "Subject" header.
-    :ivar from\_: A tuple of Address objects that represent on or more
+    :ivar from\_: A tuple of Address objects that represent one or more
       addresses from the "From" header, or None if header does not exist.
     :ivar sender: As for from\_ but represents the "Sender" header.
     :ivar reply_to: As for from\_ but represents the "Reply-To" header.

imapclient/test/test_auth.py

@@ -0,0 +1,34 @@
+# Copyright (c) 2016, Menno Smits
+# Released subject to the New BSD License
+# Please see http://en.wikipedia.org/wiki/BSD_licenses
+
+from __future__ import unicode_literals
+
+from imapclient import IMAPClient
+from .imapclient_test import IMAPClientTest
+
+
+class TestPlainLogin(IMAPClientTest):
+
+    def assert_authenticate_call(self, expected_auth_string):
+        authenticate = self.client._imap.authenticate
+        self.assertEqual(authenticate.call_count, 1)
+        auth_type, auth_func = authenticate.call_args[0]
+        self.assertEqual(auth_type, "PLAIN")
+        self.assertEqual(auth_func(None), expected_auth_string)
+
+    def test_simple(self):
+        self.client._imap.authenticate.return_value = ('OK', [b'Success'])
+        result = self.client.plain_login("user", "secret")
+        self.assertEqual(result, b'Success')
+        self.assert_authenticate_call("\0user\0secret")
+
+    def test_fail(self):
+        self.client._imap.authenticate.return_value = ('NO', [b'Boom'])
+        self.assertRaises(IMAPClient.Error, self.client.plain_login, "user", "secret")
+
+    def test_with_authorization_identity(self):
+        self.client._imap.authenticate.return_value = ('OK', [b'Success'])
+        result = self.client.plain_login("user", "secret", "authid")
+        self.assertEqual(result, b'Success')
+        self.assert_authenticate_call("authid\0user\0secret")

imapclient/version.py

@@ -4,7 +4,7 @@
 
 from __future__ import unicode_literals
 
-version_info = (1, 0, 2, 'final')
+version_info = (1, 1, 0, 'alpha')
 
 
 def _imapclient_version_string(vinfo):