From 4406046d1582dca6662dc614c1db6485f5d8871e Mon Sep 17 00:00:00 2001 From: Jason Madden Date: Fri, 21 Apr 2017 12:13:22 -0500 Subject: [PATCH] Remove __future__ imports and add Python 3.4 --- .travis.yml | 1 + CHANGES.txt | 2 +- setup.py | 1 + src/zope/app/basicskin/standardmacros.py | 2 +- tox.ini | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc7e4b8..f9678cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ sudo: false python: - 2.7 - pypy-5.4.1 + - 3.4 - 3.5 - 3.6 install: diff --git a/CHANGES.txt b/CHANGES.txt index 05f7afe..b721628 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,7 +5,7 @@ CHANGES 4.0.0 (unreleased) ------------------ -- Add support for Python 3.5 and 3.6. +- Add support for Python 3.4, 3.5, and 3.6. - Add support for PyPy. diff --git a/setup.py b/setup.py index 16687e9..5bb0789 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,7 @@ def read(*rnames): 'License :: OSI Approved :: Zope Public License', 'Programming Language :: Python', 'Programming Language :: Python:: 2.7', + 'Programming Language :: Python:: 3.4', 'Programming Language :: Python:: 3.5', 'Programming Language :: Python:: 3.6', 'Programming Language :: Python :: Implementation :: CPython', diff --git a/src/zope/app/basicskin/standardmacros.py b/src/zope/app/basicskin/standardmacros.py index e59f2f9..6353fb8 100644 --- a/src/zope/app/basicskin/standardmacros.py +++ b/src/zope/app/basicskin/standardmacros.py @@ -15,7 +15,7 @@ The macros are drawn from various different page templates. """ -from __future__ import print_function, absolute_import, division + __docformat__ = 'restructuredtext' diff --git a/tox.ini b/tox.ini index c758890..695f359 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py27, pypy, py35, py36 + py27, pypy, py34, py35, py36 [testenv] commands =