Merge pull request #2 from zopefoundation/fix-tests

Fix tests - this requires to drop Python 2.6 support.
zopefoundation · Jun 19, 2017 · 82fabab · 82fabab
2 parents d65bbe1 + b617aec
commit 82fabab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: python
 sudo: false
 env:
-    - TOXENV=py26
     - TOXENV=py27
     - TOXENV=py33
 install:

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,7 +5,7 @@ CHANGES
 4.0.0a2 (unreleased)
 --------------------
 
-- Nothing changed yet.
+- Dropped support for Python 2.6.
 
 
 4.0.0a1 (2013-02-25)

diff --git a/src/zope/generations/tests/test_generations.py b/src/zope/generations/tests/test_generations.py
@@ -25,6 +25,11 @@
      r"\1"),
     (re.compile('u(".*?")'),
      r"\1"),
+    # Python 2 bytes has no "b".
+    (re.compile("b('.*?')"),
+     r"\1"),
+    (re.compile('b(".*?")'),
+     r"\1"),
     ])
 
 

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist =
-    py26,py27,py33
+    py27,
+    py33,
 
 [testenv]
 commands =