summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Panella <gavin@gromper.net>2011-06-17 22:23:06 +0100
committerGavin Panella <gavin@gromper.net>2011-06-17 22:23:06 +0100
commit5432e4a9f4e4c0a66999f2aa6fd99223e8fe1431 (patch)
tree680900510978744a3008f9bcfc7a627d3e02cc9f
parentc3af4632ffb4805340b26021221d7f97ebc3bd98 (diff)
downloadfixtures-5432e4a9f4e4c0a66999f2aa6fd99223e8fe1431.tar.gz
Use testtools.helpers.try_import instead of try:except:.
-rw-r--r--lib/fixtures/fixture.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/fixtures/fixture.py b/lib/fixtures/fixture.py
index 3d41b11..c42bc44 100644
--- a/lib/fixtures/fixture.py
+++ b/lib/fixtures/fixture.py
@@ -22,16 +22,15 @@ __all__ = [
import sys
-try:
- from testtools import MultipleExceptions
-except ImportError:
- class MultipleExceptions(Exception):
- """Report multiple exc_info tuples in self.args."""
-
-try:
- from testtools.testcase import gather_details
-except ImportError:
- gather_details = None
+from testtools.helpers import try_import
+
+class MultipleExceptions(Exception):
+ """Report multiple exc_info tuples in self.args."""
+
+MultipleExceptions = try_import(
+ "testtools.MultipleExceptions", MultipleExceptions)
+
+gather_details = try_import("testtools.testcase.gather_details")
class Fixture(object):