Merge pull request mjs#258 from mlorant/master

Drop support of Python 2.6 and 3.3

Author: mjs

README.rst

@@ -5,7 +5,7 @@ library.
 
 =========================  ========================================
 Current version            1.0.2
-Supported Python versions  2.6, 2.7, 3.3, 3.4, 3.5 and 3.6
+Supported Python versions  2.7, 3.4, 3.5 and 3.6
 License                    New BSD
 Project home               http://imapclient.freshfoo.com/
 PyPI                       https://pypi.python.org/pypi/IMAPClient

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, 3.4, 3.5 and 3.6 are officially supported.
+Python versions 2.7, 3.4, 3.5 and 3.6 are officially supported.
 
 A Simple Example
 ----------------
@@ -309,7 +309,7 @@ The connected IMAPClient instance is available as the variable
 
     IMAPClient instance is "c"
     In [1]: c.select_folder('inbox')
-    Out[1]: 
+    Out[1]:
     {b'EXISTS': 2,
      b'FLAGS': (b'\\Answered',
          b'\\Flagged',

doc/src/releases.rst

@@ -12,7 +12,16 @@ Changed
 
 Other
 -----
-  * Drop support of OAUTH(1)
+- Drop support of OAUTH(1)
+
+
+Python compatibility
+--------------------
+This version supports Python 2.7 serie and Python 3.4, 3.5 and 3.6.
+
+Support for Python 2.6 and 3.3 is removed. We officially support the
+latest release of each series.
+
 
 ===============
  Version 1.1.0

ez_setup.py

@@ -347,7 +347,7 @@ def _parse_args():
     parser = optparse.OptionParser()
     parser.add_option(
         '--user', dest='user_install', action='store_true', default=False,
-        help='install in user site package (requires Python 2.6 or later)')
+        help='install in user site package')
     parser.add_option(
         '--download-base', dest='download_base', metavar="URL",
         default=DEFAULT_URL,

imapclient/__init__.py

@@ -11,6 +11,3 @@
 from .response_parser import *
 from .tls import *
 from .version import author as __author__, version as __version__, version_info
-
-from .imaplib_ssl_fix import apply_patch
-apply_patch()

imapclient/imaplib_ssl_fix.py

@@ -16,7 +16,6 @@
 
 MAJ_MIN_MIC = sys.version_info[:3]
 IS_PY3 = MAJ_MIN_MIC >= (3, 0, 0)
-IS_PY_26_OR_OLDER = MAJ_MIN_MIC < (2, 7, 0)
 IS_PY_278_OR_OLDER = MAJ_MIN_MIC <= (2, 7, 8)
 IS_PY_33_OR_OLDER = MAJ_MIN_MIC < (3, 4, 0)
 IS_PY_34_OR_NEWER = MAJ_MIN_MIC >= (3, 4, 0)
@@ -42,7 +41,7 @@
     * Convenience methods are provided for commonly used functionality.
     * Exceptions are raised when errors occur.
 
-Python versions 2.6, 2.7, 3.3, 3.4, 3.5 and 3.6 are officially supported.
+Python versions 2.7, 3.4, 3.5 and 3.6 are officially supported.
 
 IMAPClient includes comprehensive units tests and automated
 functional tests that can be run against a live IMAP server.
@@ -62,7 +61,7 @@ def finalize_options(self):
     def run_tests(self):
         from imapclient.test.util import unittest  # this will import unittest2
         module = "__main__"
-        if IS_PY_26_OR_OLDER or IS_PY_34_OR_NEWER:
+        if IS_PY_34_OR_NEWER:
             module = None
         unittest.main(argv=['', 'discover'], module=module)
 
@@ -78,8 +77,6 @@ def run_tests(self):
 setup_deps = common_deps + ['sphinx']
 
 test_deps = ['mock>=1.3.0']
-if IS_PY_26_OR_OLDER:
-    test_deps.append('unittest2')
 
 setup(name='IMAPClient',
       description="Easy-to-use, Pythonic and complete IMAP client library",

setup.py

@@ -1,5 +1,5 @@
 [tox]
-envlist=py26,py27,py33,py34,py35,py36
+envlist=py27,py34,py35,py36
 
 # The tests are currently run directly out of the source tree.
 # See the notes in build-sdist for more details.