summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2015-10-11 23:55:14 -0600
committerBert JW Regeer <bertjw@regeer.org>2015-10-11 23:55:14 -0600
commit6013930f5e119e3383588aeb2802811111caac40 (patch)
treec809d93939dee490519909abddfc0f3f105e21d8
parentce042deddabc824caefdcaaf97f3ab9654777a96 (diff)
downloadpyramid-6013930f5e119e3383588aeb2802811111caac40.tar.gz
pyramid-6013930f5e119e3383588aeb2802811111caac40.tar.bz2
pyramid-6013930f5e119e3383588aeb2802811111caac40.zip
No cover a branch
-rw-r--r--pyramid/util.py2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/util.py b/pyramid/util.py
index 12eae3626..5e43383b7 100644
--- a/pyramid/util.py
+++ b/pyramid/util.py
@@ -560,7 +560,7 @@ def action_method(wrapped):
# 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':
+ if last_frame.function == 'extract_stack': # pragma: no cover
f.pop()
info = ActionInfo(*f[-backframes])
except: # pragma: no cover
diff --git a/tox.ini b/tox.ini
index ae93c3785..20a9ee5b1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ basepython =
pypy: pypy
pypy3: pypy3
py2: python2.7
- py3: python3.4
+ py3: python3.5
commands =
pip install pyramid[testing]