move reraise to pyramid.util

5 files changed, 11 insertions, 11 deletions

diff --git a/src/pyramid/compat.py b/src/pyramid/compat.py
index 2dde5eeee..17527271e 100644
--- a/src/pyramid/compat.py
+++ b/src/pyramid/compat.py
@@ -62,14 +62,6 @@ url_unquote_text = url_unquote
 url_unquote_native = url_unquote
 
 
-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
-
-
 def is_nonstr_iter(v):
     if isinstance(v, str):
         return False
diff --git a/src/pyramid/config/actions.py b/src/pyramid/config/actions.py
index 9c1227d4a..4a526e242 100644
--- a/src/pyramid/config/actions.py
+++ b/src/pyramid/config/actions.py
@@ -5,7 +5,6 @@ import sys
 import traceback
 from zope.interface import implementer
 
-from pyramid.compat import reraise
 from pyramid.exceptions import (
     ConfigurationConflictError,
     ConfigurationError,
@@ -14,6 +13,7 @@ from pyramid.exceptions import (
 from pyramid.interfaces import IActionInfo
 from pyramid.registry import undefer
 from pyramid.util import is_nonstr_iter
+from pyramid.util import reraise
 
 
 class ActionConfiguratorMixin(object):
diff --git a/src/pyramid/tweens.py b/src/pyramid/tweens.py
index 839c53b8f..b5660b44b 100644
--- a/src/pyramid/tweens.py
+++ b/src/pyramid/tweens.py
@@ -1,7 +1,7 @@
 import sys
 
-from pyramid.compat import reraise
 from pyramid.httpexceptions import HTTPNotFound
+from pyramid.util import reraise
 
 
 def _error_handler(request, exc):
diff --git a/src/pyramid/util.py b/src/pyramid/util.py
index 23cce195a..544fdc6de 100644
--- a/src/pyramid/util.py
+++ b/src/pyramid/util.py
@@ -667,3 +667,11 @@ def is_unbound_method(fn):
             return True
 
     return False
+
+
+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/src/pyramid/view.py b/src/pyramid/view.py
index 9f58e72ae..9e85d7281 100644
--- a/src/pyramid/view.py
+++ b/src/pyramid/view.py
@@ -16,7 +16,6 @@ from pyramid.interfaces import (
 )
 
 from pyramid.compat import decode_path_info
-from pyramid.compat import reraise as reraise_
 
 from pyramid.exceptions import ConfigurationError, PredicateMismatch
 
@@ -29,6 +28,7 @@ from pyramid.httpexceptions import (
 from pyramid.threadlocal import get_current_registry, manager
 
 from pyramid.util import hide_attrs
+from pyramid.util import reraise as reraise_
 
 _marker = object()