Support Python3.5

bloodbare · Sep 26, 2015 · 47d2b31 · 47d2b31
1 parent 4fe2425
commit 47d2b31
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,8 +3,12 @@ Changes
 
 .. :changelog:
 
-0.3.1 (201-01-31)
+0.3.2 (2015-09-24)
 ------------------
+    - Support Python3.5
+
+0.3.1 (2015-01-31)
+-------------------
     - Fix issues related to POST requests
     - Fix issues related to coroutine mappers
     - Sync with Gunicorn settings a la issue #917

diff --git a/aiopyramid/traversal.py b/aiopyramid/traversal.py
@@ -1,13 +1,10 @@
 """
 The aiopyramid.traversal module is deprecated, use aiopyramid.helpers.synchronize instead.
 See http://aiopyramid.readthedocs.org/en/latest/features.html#traversal.
-"""  # noqa
-
-import warnings
-warnings.warn(__doc__, DeprecationWarning)
-
+"""  # NOQA
 
 import asyncio
+import warnings
 
 from pyramid.traversal import (
     ResourceTreeTraverser as TraverserBase,
@@ -22,6 +19,8 @@
 
 SLASH = "/"
 
+warnings.warn(__doc__, DeprecationWarning)
+
 
 @synchronize
 @asyncio.coroutine

diff --git a/aiopyramid/tweens.py b/aiopyramid/tweens.py
@@ -3,13 +3,13 @@
 http://aiopyramid.readthedocs.org/en/latest/features.html#tweens.
 """
 
-import warnings
-warnings.warn(__doc__, DeprecationWarning)
-
 import asyncio
+import warnings
 
 from .helpers import synchronize
 
+warnings.warn(__doc__, DeprecationWarning)
+
 
 def coroutine_logger_tween_factory(handler, registry):
     """

diff --git a/aiopyramid/websocket/config/gunicorn.py b/aiopyramid/websocket/config/gunicorn.py
@@ -35,7 +35,10 @@ def __init__(self, environ, switch_protocols):
         self.status_int = 101
 
         http_1_1 = environ['SERVER_PROTOCOL'] == 'HTTP/1.1'
-        get_header = lambda k: environ['HTTP_' + k.upper().replace('-', '_')]
+
+        def get_header(k):
+            return environ['HTTP_' + k.upper().replace('-', '_')]
+
         key = websockets.handshake.check_request(get_header)
 
         if not http_1_1 or key is None:

diff --git a/setup.py b/setup.py
@@ -24,13 +24,14 @@
 
 setup(
     name='aiopyramid',
-    version='0.3.1',
+    version='0.3.2',
     description='Tools for running pyramid using asyncio.',
     long_description=README + '\n\n\n\n' + CHANGES,
     classifiers=[
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         "Framework :: Pyramid",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
-envlist   = py33,py34
+envlist   = py33,py34,py35
 
 [testenv]
-deps      = 
+deps      =
     pytest
     pytest-pep8
 commands  = py.test --pep8