From 522778b2147aa6ad4cf2727b895b7905dcb7d0a0 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Mon, 28 Oct 2013 10:29:20 -0400 Subject: [PATCH] Trying to get imports working with both Python 2 and 3 --- skimage/novice/_novice.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/skimage/novice/_novice.py b/skimage/novice/_novice.py index fb593a69..946fab15 100644 --- a/skimage/novice/_novice.py +++ b/skimage/novice/_novice.py @@ -10,9 +10,23 @@ from skimage.transform import resize from skimage.color import color_dict from skimage._shared import six -from six.moves.urllib_parse import urlparse -from six.moves.urllib import request -urlopen = request.urlopen +try: + from urlparse import urlparse +except ImportError: + try: + from urllib import parse as 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 # Convert colors from `skimage.color` to uint8 and allow access through