From 695da418412eb2f9c5a486542278d0c7d57ce864 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Wed, 20 Nov 2013 14:00:46 -0500 Subject: [PATCH] Removed extraneous trys for six imports --- skimage/novice/_novice.py | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/skimage/novice/_novice.py b/skimage/novice/_novice.py index c582ef0e..fb593a69 100644 --- a/skimage/novice/_novice.py +++ b/skimage/novice/_novice.py @@ -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