Add PyPy2 support.

zopefoundation · Sep 7, 2017 · 059dc87 · 059dc87
1 parent feaea9e
commit 059dc87
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ python:
     - 3.4
     - 3.5
     - 3.6
+    - pypy
 install:
     - pip install -U pip setuptools
     - pip install -U coverage coveralls zope.testrunner

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,7 +5,7 @@ CHANGES
 3.5 (unreleased)
 ----------------
 
-- Add support for Python 3.6.
+- Add support for Python 3.6 and PyPy2.
 
 - Drop support for Python 3.3.
 

diff --git a/setup.py b/setup.py
@@ -89,6 +89,7 @@ def alltests():
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',

diff --git a/src/z3c/form/testing.py b/src/z3c/form/testing.py
@@ -55,6 +55,7 @@
         (re.compile("u('.*?')"), r"\1"),
         (re.compile("b('.*?')"), r"\1"),
         (re.compile("__builtin__"), r"builtins"),
+        (re.compile("<builtins\."), r"<"),
         (re.compile("<type"), r"<class"),
         (re.compile("set\(\[(.*?)\]\)"), r"{\1}"),
     )

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,py36,coverage
+    py27,py34,py35,py36,pypy,coverage
 
 [testenv]
 commands =