Add support for PyPy.

.travis.yml

@@ -5,6 +5,9 @@ env:
     - TOXENV=py27
     - TOXENV=py33
     - TOXENV=py34
+    - TOXENV=pypy
+#   Blocked on release of fix for: https://bitbucket.org/pypy/pypy/issue/1946
+#   - TOXENV=pypy3
 install:
     - travis_retry pip install tox
 script:

CHANGES.txt

@@ -1,11 +1,15 @@
-=======
-CHANGES
+Changes
 =======
 
-4.0.3 (unreleased)
+4.1.0 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Add support for PyPy.  PyPy3 support awaits release of fix for:
+  https://bitbucket.org/pypy/pypy/issue/1946
+
+- Add support for Python 3.4.
+
+- Add support for testing on Travis.
 
 
 4.0.2 (2014-11-04)
@@ -18,36 +22,36 @@ CHANGES
 4.0.1 (2013-04-03)
 ==================
 
-- Fixed some Python 3 string vs bytes issues.
+- Fix some Python 3 string vs bytes issues.
 
 
 4.0.0 (2013-02-20)
 ==================
 
-- Replaced deprecated ``zope.component.adapts`` usage with equivalent
+- Replace deprecated ``zope.component.adapts`` usage with equivalent
   ``zope.component.adapter`` decorator.
 
-- Replaced deprecated ``zope.interface.classProvides`` usage with equivalent
+- Replace deprecated ``zope.interface.classProvides`` usage with equivalent
   ``zope.interface.provider`` decorator.
 
-- Replaced deprecated ``zope.interface.implementsOnly`` usage with equivalent
+- Replace deprecated ``zope.interface.implementsOnly`` usage with equivalent
   ``zope.interface.implementer_only`` decorator.
 
-- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+- Replace deprecated ``zope.interface.implements`` usage with equivalent
   ``zope.interface.implementer`` decorator.
 
-- Dropped support for Python 2.4 and 2.5.
+- Drop support for Python 2.4 and 2.5.
 
-- Added support for Python 3.3.
+- Add support for Python 3.3.
 
 
 3.12.0 (2010-12-14)
 ===================
 
-- Added ``zcml`` extra dependencies and fixed dependencies of
+- Add ``zcml`` extra dependencies and fixed dependencies of
   ``configure.zcml`` on other packages' ``meta.zcml``.
 
-- Added a test for including our own ``configure.zcml``.
+- Add a test for including our own ``configure.zcml``.
 
 3.11.0 (2010-08-13)
 ===================

setup.py

@@ -37,24 +37,27 @@ def test_suite():
                     open('CHANGES.txt').read())
 
 setup(name='zope.browserresource',
-      version='4.0.3.dev0',
+      version='4.!.0.dev0',
       url='http://pypi.python.org/pypi/zope.browserresource/',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
-      classifiers = ['Environment :: Web Environment',
-                     'Intended Audience :: Developers',
-                     'License :: OSI Approved :: Zope Public License',
-                     '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.3',
-                     'Programming Language :: Python :: 3.4',
-                     'Operating System :: OS Independent',
-                     'Topic :: Internet :: WWW/HTTP',
-                     'Framework :: Zope3',
-                     ],
+      classifiers = [
+            'Environment :: Web Environment',
+            'Intended Audience :: Developers',
+            'License :: OSI Approved :: Zope Public License',
+            '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.3',
+            'Programming Language :: Python :: 3.4',
+            'Programming Language :: Python :: Implementation :: CPython',
+            'Programming Language :: Python :: Implementation :: PyPy',
+            'Operating System :: OS Independent',
+            'Topic :: Internet :: WWW/HTTP',
+            'Framework :: Zope3',
+            ],
       description='Browser resources implementation for Zope.',
       long_description=long_description,
       license='ZPL 2.1',

tox.ini

@@ -1,5 +1,8 @@
 [tox]
-envlist = py26,py27,py33,py34
+#   PyPy3 blocked on release of fix for:
+#   https://bitbucket.org/pypy/pypy/issue/1946
+#envlist = py26,py27,py33,py34,pypy,pypy3
+envlist = py26,py27,py33,py34,pypy
 
 [testenv]
 commands = python setup.py test -q