diff options
| author | Michael Merickel <michael@merickel.org> | 2015-10-14 22:50:09 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-10-14 22:50:09 -0500 |
| commit | 3ea5f7dceb79662cdcf94877fe73ac57f53c9c17 (patch) | |
| tree | d3cbfdebf22a2c42a78db1fc1220e5f5728b5245 | |
| parent | e9637c7f521c1f499e12115fa035a55d15ce65e8 (diff) | |
| parent | 6013930f5e119e3383588aeb2802811111caac40 (diff) | |
| download | pyramid-3ea5f7dceb79662cdcf94877fe73ac57f53c9c17.tar.gz pyramid-3ea5f7dceb79662cdcf94877fe73ac57f53c9c17.tar.bz2 pyramid-3ea5f7dceb79662cdcf94877fe73ac57f53c9c17.zip | |
Merge pull request #1976 from bertjwregeer/fix/python3.5
Fix python 3.5 support
| -rw-r--r-- | .travis.yml | 34 | ||||
| -rw-r--r-- | pyramid/util.py | 9 | ||||
| -rw-r--r-- | tox.ini | 5 |
3 files changed, 33 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index ba077d342..79d9fa09d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,18 +2,28 @@ language: python sudo: false -env: - - TOXENV=py26 - - TOXENV=py27 - - TOXENV=py32 - - TOXENV=py33 - - TOXENV=py34 - - TOXENV=pypy - - TOXENV=pypy3 - - TOXENV=py2-docs - - TOXENV=py3-docs - - TOXENV=py2-cover,py3-cover,coverage - - TOXENV=pep8 +matrix: + include: + - python: 2.6 + env: TOXENV=py26 + - python: 2.7 + env: TOXENV=py27 + - python: 3.2 + env: TOXENV=py32 + - python: 3.3 + env: TOXENV=py33 + - python: 3.4 + env: TOXENV=py34 + - python: 3.5 + env: TOXENV=py35 + - python: pypy + env: TOXENV=pypy + - python: pypy3 + env: TOXENV=pypy3 + - python: 3.5 + env: TOXENV=py2-cover,py3-cover,coverage + - python: 3.5 + env: TOXENV=pep8 install: - travis_retry pip install tox diff --git a/pyramid/util.py b/pyramid/util.py index 1ae7e6afc..5e43383b7 100644 --- a/pyramid/util.py +++ b/pyramid/util.py @@ -554,7 +554,14 @@ def action_method(wrapped): info = ActionInfo(*info) if info is None: try: - f = traceback.extract_stack(limit=3) + f = traceback.extract_stack(limit=4) + + # Work around a Python 3.5 issue whereby it would insert an + # extra stack frame. This should no longer be necessary in + # Python 3.5.1 + last_frame = ActionInfo(*f[-1]) + if last_frame.function == 'extract_stack': # pragma: no cover + f.pop() info = ActionInfo(*f[-backframes]) except: # pragma: no cover info = ActionInfo(None, 0, '', '') @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py32,py33,py34,pypy,pypy3,pep8, + py26,py27,py32,py33,py34,py35,pypy,pypy3,pep8, {py2,py3}-docs, {py2,py3}-cover,coverage, @@ -13,10 +13,11 @@ basepython = py32: python3.2 py33: python3.3 py34: python3.4 + py35: python3.5 pypy: pypy pypy3: pypy3 py2: python2.7 - py3: python3.4 + py3: python3.5 commands = pip install pyramid[testing] |