diff options
| author | Sean Reifschneider <jafo@tummy.com> | 2014-05-11 15:26:40 -0600 |
|---|---|---|
| committer | Sean Reifschneider <jafo@tummy.com> | 2014-05-11 15:26:40 -0600 |
| commit | e268a8b0cae77a9cf669e5e51d9216c6d5881871 (patch) | |
| tree | dc70b1c649b7832858e7785283d1142f4b74a3b4 | |
| parent | b09302dbbe3e50719a75b17b5d529dc41795f104 (diff) | |
| parent | 79b149b81d3b67a164a37565044b21220de41db9 (diff) | |
| download | python-memcached-e268a8b0cae77a9cf669e5e51d9216c6d5881871.tar.gz | |
Merge pull request #43 from alex/finish-py3k
Complete the Python3 work!
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | memcache.py | 2 | ||||
| -rwxr-xr-x | releasescript.auto | 2 | ||||
| -rw-r--r-- | setup.cfg | 3 | ||||
| -rw-r--r-- | setup.py | 8 | ||||
| -rw-r--r-- | tox.ini | 2 |
6 files changed, 17 insertions, 3 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/releasescript.auto b/releasescript.auto index cbdab1e..e9d9141 100755 --- a/releasescript.auto +++ b/releasescript.auto @@ -13,5 +13,5 @@ pydoc -w ./memcache.py rm -f releasescript.auto -python setup.py sdist upload +python setup.py sdist bdist_wheel upload rm -rf *.pyc dist python_memcached.egg-info @@ -2,3 +2,6 @@ release = 1 packager = Sean Reifschneider <jafo-rpms@tummy.com> requires = python-memcached + +[wheel] +universal = 1 @@ -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" ]) @@ -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] |