dev-zero
diff --git a/‎docs/changelog.rst‎
Lines changed: 11 additions & 2 deletions b/‎docs/changelog.rst‎
Lines changed: 11 additions & 2 deletions
diff --git a/‎future/utils/__init__.py‎
Lines changed: 20 additions & 0 deletions b/‎future/utils/__init__.py‎
Lines changed: 20 additions & 0 deletions
@@ -49,8 +49,17 @@ or just those you need::
     >>> from future import open, str
 
 
-Deprecated isinstance removed
------------------------------
+Utility functions for raising exceptions with a traceback portably
+------------------------------------------------------------------
+
+The functions ``raise_with_traceback()`` and ``raise_`` were added to
+``future.utils`` to offer either the Python 3.x or Python 2.x behaviour
+for raising exceptions. Thanks to Joel Tratner for the contribution of
+these.
+
+
+Deprecated ``isinstance`` replacement removed
+---------------------------------------------
 
 ``future`` v0.8.2 briefly introduced a replacement for the ``isinstance``
 builtin. This was then removed and its use was deprecated as of v0.9.0.
 
@@ -328,13 +328,33 @@ def raise_(tp, value=None, tb=None):
         if exc.__traceback__ is not tb:
             raise exc.with_traceback(tb)
 
+    def raise_with_traceback(exc, traceback=Ellipsis):
+        if traceback == Ellipsis:
+            _, _, traceback = sys.exc_info()
+        raise exc.with_traceback(traceback)
+
 else:
     exec('''
 def raise_(tp, value=None, tb=None):
     raise tp, value, tb
+
+def raise_with_traceback(exc, traceback=Ellipsis):
+    if traceback == Ellipsis:
+        _, _, traceback = sys.exc_info()
+    raise exc, None, traceback
 '''.strip())
 
 
+raise_with_traceback.__doc__ = (
+"""Raise exception with existing traceback.
+If traceback is not passed, uses sys.exc_info() to get traceback."""
+)
+
+
+# Deprecated alias for backward compatibility with ``future`` versions < 0.11:
+reraise = raise_
+
+
 def implements_iterator(cls):
     '''
     From jinja2/_compat.py. License: BSD.