summaryrefslogtreecommitdiff
path: root/unit_tests/test_twisted.py
diff options
context:
space:
mode:
authorJason Pellerin <jpellerin@gmail.com>2008-03-26 16:45:14 +0000
committerJason Pellerin <jpellerin@gmail.com>2008-03-26 16:45:14 +0000
commiteb24eab03f96db508c52833df20c83320958cdfc (patch)
tree95116230b958017cdf25c8e8b4ad0974367f883a /unit_tests/test_twisted.py
parentb570a203b505ecc3e2e35c3be2f80f2ccf7be607 (diff)
downloadnose-eb24eab03f96db508c52833df20c83320958cdfc.tar.gz
Merged 160-jython. Add test.sh shell script to run selftest under python2.3-2.5 and jython. Updated ls_tree and svn:ignore to ignore $py.class files.
Diffstat (limited to 'unit_tests/test_twisted.py')
-rw-r--r--unit_tests/test_twisted.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/unit_tests/test_twisted.py b/unit_tests/test_twisted.py
index e693374..48ca8cd 100644
--- a/unit_tests/test_twisted.py
+++ b/unit_tests/test_twisted.py
@@ -1,9 +1,12 @@
from nose.exc import SkipTest
from nose.tools import *
from nose.twistedtools import *
+try:
+ from twisted.internet.defer import Deferred
+ from twisted.internet.error import DNSLookupError
+except ImportError:
+ raise SkipTest('twisted not available; skipping')
-from twisted.internet.defer import Deferred
-from twisted.internet.error import DNSLookupError
def teardown():