Move context module to jaraco.context package.

Author: jaraco

CHANGES.txt

@@ -11,6 +11,8 @@ Changes
   has been moved to the ``jaraco.classes`` package.
 * Deprecated ``jaraco.util.classlib.ensure_sequence``. Use
   ``jaraco.itertools.always_iterable`` instead.
+* Deprecated ``jaraco.util.context``. Functionality moved to
+  ``jaraco.context``.
 
 10.8
 ~~~~

jaraco/util/context.py

@@ -1,54 +1,7 @@
-import contextlib
+import warnings
 
+from jaraco.context import *
 
-@contextlib.contextmanager
-def null_context():
-	yield
+warnings.warn("Use jaraco.context package", DeprecationWarning)
 
-
-class ExceptionTrap(object):
-	"""
-	A context manager that will catch certain exceptions and provide an
-	indication they occurred.
-
-	>>> with ExceptionTrap() as trap:
-	...     raise Exception()
-	>>> bool(trap)
-	True
-
-	>>> with ExceptionTrap() as trap:
-	...     pass
-	>>> bool(trap)
-	False
-
-	>>> with ExceptionTrap(ValueError) as trap:
-	...     raise ValueError("1 + 1 is not 3")
-	>>> bool(trap)
-	True
-
-	>>> with ExceptionTrap(ValueError) as trap:
-	...     raise Exception()
-	Traceback (most recent call last):
-	...
-	Exception
-
-	>>> bool(trap)
-	False
-	"""
-	exc_info = None, None, None
-
-	def __init__(self, exceptions=(Exception,)):
-		self.exceptions = exceptions
-
-	def __enter__(self):
-		return self
-
-	def __exit__(self, exc_type, exc_val, traceback):
-		matches = exc_type and issubclass(exc_type, self.exceptions)
-		if matches:
-			self.exc_info = exc_type, exc_val, traceback
-		return matches
-
-	def __bool__(self):
-		return bool(self.exc_info[0])
-	__nonzero__ = __bool__
+null_context = null

jaraco/util/exceptions.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from . import context
+from jaraco import context
 
 
 def throws_exception(callable, *exceptions):

jaraco/util/string.py

@@ -8,8 +8,8 @@
 
 import six
 from jaraco.functools import compose
+from jaraco.context import ExceptionTrap
 
-from .context import ExceptionTrap
 import jaraco.util.dictlib
 
 

setup.py

@@ -56,6 +56,7 @@
 		'jaraco.itertools',
 		'jaraco.logging',
 		'jaraco.classes>=1.1',
+		'jaraco.context>=1.2',
 	],
 	tests_require=[
 		'pytest>=2',