Merge pull request #191 from hugovk/update-versions

Update Python versions

Author: ionrock

cachecontrol/adapter.py

@@ -10,7 +10,7 @@
 
 
 class CacheControlAdapter(HTTPAdapter):
-    invalidating_methods = set(['PUT', 'DELETE'])
+    invalidating_methods = {'PUT', 'DELETE'}
 
     def __init__(self, cache=None,
                  cache_etags=True,

cachecontrol/caches/redis_cache.py

@@ -4,16 +4,6 @@
 from cachecontrol.cache import BaseCache
 
 
-def total_seconds(td):
-    """Python 2.6 compatability"""
-    if hasattr(td, 'total_seconds'):
-        return int(td.total_seconds())
-
-    ms = td.microseconds
-    secs = (td.seconds + td.days * 24 * 3600)
-    return int((ms + secs * 10**6) / 10**6)
-
-
 class RedisCache(BaseCache):
 
     def __init__(self, conn):
@@ -27,7 +17,7 @@ def set(self, key, value, expires=None):
             self.conn.set(key, value)
         else:
             expires = expires - datetime.utcnow()
-            self.conn.setex(key, total_seconds(expires), value)
+            self.conn.setex(key, int(expires.total_seconds()), value)
 
     def delete(self, key):
         self.conn.delete(key)

cachecontrol/heuristics.py

@@ -100,9 +100,8 @@ class LastModified(BaseHeuristic):
     http://lxr.mozilla.org/mozilla-release/source/netwerk/protocol/http/nsHttpResponseHead.cpp#397
     Unlike mozilla we limit this to 24-hr.
     """
-    cacheable_by_default_statuses = set([
-        200, 203, 204, 206, 300, 301, 404, 405, 410, 414, 501
-    ])
+    cacheable_by_default_statuses = {200, 203, 204, 206, 300, 301, 404, 405,
+                                     410, 414, 501}
 
     def update_headers(self, resp):
         headers = resp.headers

cachecontrol/serialize.py

@@ -95,7 +95,7 @@ def loads(self, request, data):
 
         # Dispatch to the actual load method for the given version
         try:
-            return getattr(self, "_loads_v{0}".format(ver))(request, data)
+            return getattr(self, "_loads_v{}".format(ver))(request, data)
         except AttributeError:
             # This is a version we don't have a loads function for, so we'll
             # just treat it as a miss and return None

examples/benchmark.py

@@ -9,7 +9,7 @@
 
 HOST = 'localhost'
 PORT = 8050
-URL = 'http://{0}:{1}/'.format(HOST, PORT)
+URL = 'http://{}:{}/'.format(HOST, PORT)
 
 
 class Server(object):

setup.py

@@ -30,17 +30,18 @@
             'doesitcache = cachecontrol._cmd:main',
         ]
     },
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP',
     ],
 )

tests/conftest.py

@@ -48,7 +48,7 @@ def vary_accept(self, env, start_response):
 
     def update_etag_string(self):
         self.etag_count += 1
-        self.etag_string = '"ETAG-{0}"'.format(self.etag_count)
+        self.etag_string = '"ETAG-{}"'.format(self.etag_count)
 
     def update_etag(self, env, start_response):
         self.update_etag_string()
@@ -155,7 +155,7 @@ def pytest_namespace():
     logger.removeHandler(logger.handlers[0])
 
     cherrypy.server.start()
-    return dict(server=cherrypy.server)
+    return {'server': cherrypy.server}
 
 
 def pytest_unconfigure(config):

tests/test_storage_filecache.py

@@ -19,7 +19,7 @@ def randomdata():
     key = ''.join(sample(string.ascii_lowercase, randint(2, 4)))
     val = ''.join(sample(string.ascii_lowercase + string.digits,
                          randint(2, 10)))
-    return '&{0}={1}'.format(key, val)
+    return '&{}={}'.format(key, val)
 
 
 class TestStorageFileCache(object):