summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2022-03-13 17:49:13 -0500
committerGitHub <noreply@github.com>2022-03-13 17:49:13 -0500
commit1e439035e41da3767acbcae79689fb05dfdeb317 (patch)
tree544d1b4ea2c7e40b79fb91f96f4d848743129f2e
parent9531d37e843efcae676fd6cafe697fefd7bc5f7d (diff)
parent90e4de273506e8fd6b66e18517e98eaa61f5e268 (diff)
downloadpyramid-1e439035e41da3767acbcae79689fb05dfdeb317.tar.gz
pyramid-1e439035e41da3767acbcae79689fb05dfdeb317.tar.bz2
pyramid-1e439035e41da3767acbcae79689fb05dfdeb317.zip
Merge pull request #3698 from Pylons/fix-action-method
remove obsolete hack required on unsupported version 3.5.0
-rw-r--r--src/pyramid/config/actions.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/pyramid/config/actions.py b/src/pyramid/config/actions.py
index c3554ced8..d80f840ac 100644
--- a/src/pyramid/config/actions.py
+++ b/src/pyramid/config/actions.py
@@ -557,13 +557,6 @@ def action_method(wrapped):
if info is None:
try:
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 Exception: # pragma: no cover
info = ActionInfo(None, 0, '', '')