From f11ef60c35d9e986ec77c5adb99da8c6cbe6b89d Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Tue, 29 Oct 2013 09:43:52 -0400 Subject: [PATCH] Fixed import of urlparse and rebase on upstream --- skimage/novice/_novice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/novice/_novice.py b/skimage/novice/_novice.py index 946fab15..c582ef0e 100644 --- a/skimage/novice/_novice.py +++ b/skimage/novice/_novice.py @@ -14,7 +14,7 @@ try: from urlparse import urlparse except ImportError: try: - from urllib import parse as urlparse + from urllib.parse import urlparse except ImportError: from six.moves.urllib_parse import urlparse