diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-05-26 19:52:18 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2014-05-26 19:52:18 +0300 |
| commit | fd19da346b7bcbc6310a4f53d3d224797a319e9c (patch) | |
| tree | 8a1e7bf7e0357fe16955c86220b33eb6705226a2 /mediagoblin/plugins/api/tools.py | |
| parent | 386c9c7c55147b27c258edd5deee36594553493d (diff) | |
| download | mediagoblin-fd19da346b7bcbc6310a4f53d3d224797a319e9c.tar.lz mediagoblin-fd19da346b7bcbc6310a4f53d3d224797a319e9c.tar.xz mediagoblin-fd19da346b7bcbc6310a4f53d3d224797a319e9c.zip | |
Use six.moves.urllib.parse instead of the urlparse module.
Diffstat (limited to 'mediagoblin/plugins/api/tools.py')
| -rw-r--r-- | mediagoblin/plugins/api/tools.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/plugins/api/tools.py b/mediagoblin/plugins/api/tools.py index d1b3ebb1..56256236 100644 --- a/mediagoblin/plugins/api/tools.py +++ b/mediagoblin/plugins/api/tools.py @@ -18,9 +18,11 @@ import logging import json from functools import wraps -from urlparse import urljoin from werkzeug.exceptions import Forbidden from werkzeug.wrappers import Response + +from six.moves.urllib.parse import urljoin + from mediagoblin import mg_globals from mediagoblin.tools.pluginapi import PluginManager from mediagoblin.storage.filestorage import BasicFileStorage |