summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-10-19 21:37:14 -0400
committerChris McDonough <chrism@plope.com>2011-10-19 21:37:14 -0400
commitb75e577383936454d8b3e912f4f5478bf9af01e6 (patch)
tree964438ee256ca9960abc51424d1fbc742a2b2398
parent0aa2b21d8c42ec7f2de97900050ce16650620bbf (diff)
downloadpyramid-b75e577383936454d8b3e912f4f5478bf9af01e6.tar.gz
pyramid-b75e577383936454d8b3e912f4f5478bf9af01e6.tar.bz2
pyramid-b75e577383936454d8b3e912f4f5478bf9af01e6.zip
fix reraise case for python 3
-rw-r--r--pyramid/compat.py2
-rw-r--r--pyramid/mako_templating.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/pyramid/compat.py b/pyramid/compat.py
index 3ac235b0f..73f52b617 100644
--- a/pyramid/compat.py
+++ b/pyramid/compat.py
@@ -101,6 +101,8 @@ if PY3: # pragma: no cover
def reraise(tp, value, tb=None):
+ if value is None:
+ value = tp
if value.__traceback__ is not tb:
raise value.with_traceback(tb)
raise value
diff --git a/pyramid/mako_templating.py b/pyramid/mako_templating.py
index 9980faf9d..e4571ba1b 100644
--- a/pyramid/mako_templating.py
+++ b/pyramid/mako_templating.py
@@ -8,7 +8,7 @@ from zope.interface import Interface
from pyramid.asset import resolve_asset_spec
from pyramid.asset import abspath_from_asset_spec
from pyramid.compat import is_nonstr_iter
-from pyramid.exceptions import ConfigurationError
+from pyramid.compat import reraise
from pyramid.interfaces import ITemplateRenderer
from pyramid.settings import asbool
from pyramid.util import DottedNameResolver
@@ -151,7 +151,7 @@ class MakoLookupTemplateRenderer(object):
error=exc_info[1],
traceback=exc_info[2]
)
- raise MakoRenderingException(errtext), None, exc_info[2]
+ reraise(MakoRenderingException(errtext), None, exc_info[2])
finally:
del exc_info