projects
/
mediagoblin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
853b74c
)
Import urlparse from six.moves to work on both Python 2 and 3.
author
Berker Peksag
<berker.peksag@gmail.com>
Fri, 5 Jun 2015 16:45:00 +0000
(19:45 +0300)
committer
Berker Peksag
<berker.peksag@gmail.com>
Fri, 5 Jun 2015 16:45:51 +0000
(19:45 +0300)
mediagoblin/tools/routing.py
patch
|
blob
|
blame
|
history
diff --git
a/mediagoblin/tools/routing.py
b/mediagoblin/tools/routing.py
index ae7c7154460751a88e4f6e376794f6f2d5da2db0..8a30bab207c4a583185deaeb2dbce7ea54c58b48 100644
(file)
--- 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