From 8d6c6d99629369f219efa8435f22fedd32482055 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Wed, 10 Dec 2014 13:53:37 -0500
Subject: [PATCH] Add support for Python 3.4, PyPy3.

---
 CHANGES.txt | 2 ++
 setup.py    | 1 +
 tox.ini     | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ed227f9..6df0f61 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,8 @@
 0.14 (Unreleased)
 -----------------
 
+- Added support for Python3.4, PyPy3.
+
 - Pull #52: Add configuration options for ``mail.sendmail_app`` and
   ``mail.sendmail_template`` to allow use with non-default sendmail
   configurations.
diff --git a/setup.py b/setup.py
index 3908cd5..c10746e 100644
--- a/setup.py
+++ b/setup.py
@@ -78,6 +78,7 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Framework :: Pyramid",
diff --git a/tox.ini b/tox.ini
index f17068d..8a7f7e2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist = 
-    py26,py27,py32,py33,pypy,cover
+    py26,py27,py32,py33,py34,pypy,pypy3,cover
 
 [testenv]
 deps =