Skip to content

Commit b94da1a

Browse files
committed
Cleanup Py2-3 compat with ImportError
1 parent 0b956cc commit b94da1a

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

tests/base.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,6 @@
1616
from shotgun_api3.shotgun import ServerCapabilities
1717
from shotgun_api3.lib import six
1818

19-
try:
20-
# Attempt to import skip from unittest. Since this was added in Python 2.7
21-
# in the case that we're running on Python 2.6 we'll need a decorator to
22-
# provide some equivalent functionality.
23-
from unittest import skip
24-
except ImportError:
25-
# On Python 2.6 we'll just have to ignore tests that are skipped -- we won't
26-
# mark them as skipped, but we will not fail on them.
27-
def skip(f):
28-
return lambda self: None
29-
3019

3120
THUMBNAIL_MAX_ATTEMPTS = 30
3221
THUMBNAIL_RETRY_INTERVAL = 10

0 commit comments

Comments
 (0)