commit 484713ffd0cb96ee36173363b6733d6b3dd32b4d
author Alex Gaynor <alex.gaynor@gmail.com> Thu Oct 31 14:59:13 2013 -0700
committer Alex Gaynor <alex.gaynor@gmail.com> Thu Oct 31 14:59:13 2013 -0700
tree 55c68e5cdb926202c7fdd6cfbd3c608fe577c102
parent 38f34557e432f98cc8a023e621b5efe525ef886c
parent 0e5fd074b79f6dc86bcc643772b731594bcbb011

Merge branch 'master' into fernet

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 9710537..cf6ecef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@
     - TOX_ENV=pypy CC=clang
     - TOX_ENV=docs
     - TOX_ENV=pep8
+    - TOX_ENV=py3pep8
 
 install:
     - "[[ ${TOX_ENV} == pypy ]] && sudo add-apt-repository -y ppa:pypy/ppa || true"

tox.ini

diff --git a/tox.ini b/tox.ini
index 57b4241..7f02eab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py32,py33,docs,pep8
+envlist = py26,py27,pypy,py32,py33,docs,pep8,py3pep8
 
 [testenv]
 deps =
@@ -23,5 +23,10 @@
 deps = flake8
 commands = flake8 .
 
+[testenv:py3pep8]
+basepython = python3.3
+deps = flake8
+commands = flake8 .
+
 [flake8]
 exclude = .tox,*.egg