From 37710c426ae6793c8c59cda711a3c4c8695eeffa Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 10 May 2014 15:33:31 -0700 Subject: Complete the Python3 work! --- .travis.yml | 3 +++ memcache.py | 2 +- setup.cfg | 3 +++ setup.py | 8 ++++++++ tox.ini | 2 +- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a3a3f2..64854a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,9 @@ language: python python: - 2.6 - 2.7 + - 3.2 + - 3.3 + - 3.4 - pypy install: python setup.py install before_script: pip install nose diff --git a/memcache.py b/memcache.py index baa0063..ce93c82 100644 --- a/memcache.py +++ b/memcache.py @@ -773,7 +773,7 @@ class Client(local): # short-circuit if there are no servers, just return all keys if not server_keys: return(mapping.keys()) - for server, keys in server_keys.iteritems(): + for server, keys in server_keys.items(): try: for key in keys: if server.readline() == 'STORED': diff --git a/setup.cfg b/setup.cfg index 6b2c070..4eee543 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,3 +2,6 @@ release = 1 packager = Sean Reifschneider requires = python-memcached + +[wheel] +universal = 1 diff --git a/setup.py b/setup.py index f66b227..3f305a8 100644 --- a/setup.py +++ b/setup.py @@ -22,5 +22,13 @@ setup(name="python-memcached", "Programming Language :: Python", "Topic :: Internet", "Topic :: Software Development :: Libraries :: Python Modules", + "Programming Language :: Python", + "Programming Language :: Python :: 2", + "Programming Language :: Python :: 2.6", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.2", + "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4" ]) diff --git a/tox.ini b/tox.ini index a1dcac2..693169e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = py26,py27,py33,pypy,pep8 +envlist = py26,py27,py32,py33,py34,pypy,pep8 skipsdist = True [testenv] -- cgit v1.2.1