Merge pull request #47 from launchdarkly/eb/ch15531/drop-python-2.6

drop Python 2.6 support

Author: eli-darkly

README.md

@@ -38,12 +38,9 @@ Your first feature flag
         else:
             # the code to run if the feature is off
 
-Python 2.6
+Supported Python versions
 ----------
-Python 2.6 requires an extra dependency. Here's how to set it up:
-
-1. Use the `python2.6` extra  in your requirements.txt:
-    `ldclient-py[python2.6]`
+The SDK is tested with the most recent patch releases of Python 2.7, 3.3, 3.4, 3.5, and 3.6. Python 2.6 is no longer supported.
 
 Learn more
 -----------

ldclient/client.py

@@ -21,7 +21,7 @@
     import queue
 except:
     # noinspection PyUnresolvedReferences,PyPep8Naming
-    import Queue as queue
+    import Queue as queue  # Python 3
 
 from cachecontrol import CacheControl
 from threading import Lock

ldclient/expiringdict.py

@@ -23,11 +23,7 @@
 import time
 from threading import RLock
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    # Python < 2.7
-    from ordereddict import OrderedDict
+from collections import OrderedDict
 
 
 class ExpiringDict(OrderedDict):

python2.6-requirements.txt

@@ -12,14 +12,12 @@
 
 # parse_requirements() returns generator of pip.req.InstallRequirement objects
 install_reqs = parse_requirements('requirements.txt', session=uuid.uuid1())
-python26_reqs = parse_requirements('python2.6-requirements.txt', session=uuid.uuid1())
 test_reqs = parse_requirements('test-requirements.txt', session=uuid.uuid1())
 redis_reqs = parse_requirements('redis-requirements.txt', session=uuid.uuid1())
 
 # reqs is a list of requirement
 # e.g. ['django==1.5.1', 'mezzanine==1.4.6']
 reqs = [str(ir.req) for ir in install_reqs]
-python26reqs = [str(ir.req) for ir in python26_reqs]
 testreqs = [str(ir.req) for ir in test_reqs]
 redisreqs = [str(ir.req) for ir in redis_reqs]
 
@@ -54,17 +52,17 @@ def run(self):
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Software Development',
         'Topic :: Software Development :: Libraries',
     ],
     extras_require={
-        "redis": redisreqs,
-        "python2.6": python26reqs
+        "redis": redisreqs
     },
     tests_require=testreqs,
     cmdclass={'test': PyTest},