Test with Python 3.3 to 3.5.

.gitignore

@@ -10,4 +10,5 @@ develop-eggs
 *.pyo
 *.so
 .installed.cfg
+.tox
 *.egg-info

.travis.yml

@@ -2,8 +2,9 @@ language: python
 sudo: false
 python:
     - 2.7
-    - 3.2
     - 3.3
+    - 3.4
+    - 3.5
 install:
     - python bootstrap.py
     - bin/buildout

CHANGES.txt

 Changelog
 =========
 
-2.13.0 - unreleased
--------------------
+3.0 - unreleased
+----------------
 
-- Python 3 compatibility
+- Python 3.3-3.5 compatibility.
 
 2.12.2 - 2012-10-14
 -------------------

buildout.cfg

 [buildout]
+extends = https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
 develop = .
-parts = test
+parts = interpreter test tox
+
+[versions]
+tempstorage =
+
+[interpreter]
+recipe = zc.recipe.egg
+interpreter = python
+eggs = tempstorage
 
 [test]
 recipe = zc.recipe.testrunner
 eggs = tempstorage
 
+[tox]
+recipe = zc.recipe.egg
+eggs = tox

setup.py

@@ -16,11 +16,11 @@
 
 from setuptools import setup, find_packages
 
-long_description = open("README.txt").read() + "\n" + \
-                   open("CHANGES.txt").read()
+long_description = (open("README.txt").read() + "\n" +
+                    open("CHANGES.txt").read())
 
 setup(name='tempstorage',
-      version = '2.13.dev0',
+      version='3.0.dev0',
       url='http://pypi.python.org/pypi/tempstorage',
       license='ZPL 2.1',
       description='A RAM-based storage for ZODB',
@@ -28,15 +28,14 @@ setup(name='tempstorage',
       author_email='zope-dev@zope.org',
       long_description=long_description,
       classifiers=[
-        "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",
-        "Programming Language :: Python :: Implementation :: CPython",
+          "Programming Language :: Python",
+          "Programming Language :: Python :: 2",
+          "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 :: Implementation :: CPython",
       ],
       packages=find_packages('src'),
       package_dir={'': 'src'},

src/tempstorage/TemporaryStorage.py

@@ -323,17 +323,17 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
 
         try:
             del referenceCount[oid]
-        except:
+        except Exception:
             pass
 
         try:
             del self._opickle[oid]
-        except:
+        except Exception:
             pass
 
         try:
             del self._index[oid]
-        except:
+        except Exception:
             pass
 
         # remove this object from the conflict cache if it exists there
@@ -361,7 +361,7 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
                 referenceCount[roid] = rc
         try:
             del self._oreferences[oid]
-        except:
+        except Exception:
             pass
 
     def pack(self, t, referencesf):

tox.ini

+[tox]
+envlist =
+    py27,py33,py34,py35,pypy,pypy3
+
+[testenv]
+commands =
+    zope-testrunner --test-path=src --auto-color --auto-progress
+    
+deps =
+    ZODB
+    zope.testing
+    zope.testrunner