From 74060290343fc5ea71e738965949957ac9ca9dd1 Mon Sep 17 00:00:00 2001
From: Michael Howitz <mh@gocept.com>
Date: Sat, 12 Nov 2016 09:59:20 +0100
Subject: [PATCH] Drop support for Python 2.6 and add support for Python 3.5.

---
 .travis.yml | 2 +-
 CHANGES.txt | 6 +++++-
 setup.py    | 4 ++--
 tox.ini     | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 28bea455..565fadd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,10 @@ cache:
     - .tox
 language: python
 env:
-    - TOXENV=py26
     - TOXENV=py27
     - TOXENV=py33
     - TOXENV=py34
+    - TOXENV=py35
 install:
     - travis_retry pip install tox
 script:
diff --git a/CHANGES.txt b/CHANGES.txt
index 8b656cf9..30043b25 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,9 +2,13 @@
 CHANGES
 =======
 
-3.3.1 (unreleased)
+3.4.0 (unreleased)
 ------------------
 
+- Drop support for Python 2.6.
+
+- Support Python 3.5 officially.
+
 - Fix TypeError: object of type 'generator' has no ``len()``.
   Happens with z3c.formwidget.query.  [maurits]
 
diff --git a/setup.py b/setup.py
index 59b3bf41..5bbaaf92 100644
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,7 @@ def alltests():
 
 setup(
     name='z3c.form',
-    version='3.3.1.dev0',
+    version='3.4.0.dev0',
     author="Stephan Richter, Roger Ineichen and the Zope Community",
     author_email="zope-dev@zope.org",
     description="An advanced form and widget framework for Zope 3",
@@ -83,11 +83,11 @@ def alltests():
         '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 :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Natural Language :: English',
         'Operating System :: OS Independent',
diff --git a/tox.ini b/tox.ini
index c6227d10..bd331f44 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py26,py27,py33,py34
+    py27,py33,py34,py35
 
 [testenv]
 commands =