From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 5 Jun 2015 16:45:00 +0000 (+0300)
Subject: Import urlparse from six.moves to work on both Python 2 and 3.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bf6ae3816fab3dec04161b51a3c6608d42ce0c13;p=mediagoblin.git

Import urlparse from six.moves to work on both Python 2 and 3.
---

diff --git a/mediagoblin/tools/routing.py b/mediagoblin/tools/routing.py
index ae7c7154..8a30bab2 100644
--- a/mediagoblin/tools/routing.py
+++ b/mediagoblin/tools/routing.py
@@ -15,10 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-import urlparse
 
 import six
+
+from six.moves.urllib.parse import urlparse
 from werkzeug.routing import Map, Rule
+
 from mediagoblin.tools.common import import_component