Removed extraneous trys for six imports

This commit is contained in:
Michael Hansen
2013-11-20 14:00:46 -05:00
parent f11ef60c35
commit 695da41841
+3 -17
View File
@@ -10,23 +10,9 @@ from skimage.transform import resize
from skimage.color import color_dict
from skimage._shared import six
try:
from urlparse import urlparse
except ImportError:
try:
from urllib.parse import urlparse
except ImportError:
from six.moves.urllib_parse import urlparse
try:
from urllib2 import urlopen
except ImportError:
try:
from urllib import request
urlopen = request.urlopen
except ImportError:
from six.moves.urllib import request
urlopen = request.urlopen
from six.moves.urllib_parse import urlparse
from six.moves.urllib import request
urlopen = request.urlopen
# Convert colors from `skimage.color` to uint8 and allow access through