aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_auth.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-05-26 19:52:18 +0300
committerBerker Peksag <berker.peksag@gmail.com>2014-05-26 19:52:18 +0300
commitfd19da346b7bcbc6310a4f53d3d224797a319e9c (patch)
tree8a1e7bf7e0357fe16955c86220b33eb6705226a2 /mediagoblin/tests/test_auth.py
parent386c9c7c55147b27c258edd5deee36594553493d (diff)
downloadmediagoblin-fd19da346b7bcbc6310a4f53d3d224797a319e9c.tar.lz
mediagoblin-fd19da346b7bcbc6310a4f53d3d224797a319e9c.tar.xz
mediagoblin-fd19da346b7bcbc6310a4f53d3d224797a319e9c.zip
Use six.moves.urllib.parse instead of the urlparse module.
Diffstat (limited to 'mediagoblin/tests/test_auth.py')
-rw-r--r--mediagoblin/tests/test_auth.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index 1bbc3d01..e8fd76d8 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -14,10 +14,12 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import urlparse
+
import pkg_resources
import pytest
+import six.moves.urllib.parse as urlparse
+
from mediagoblin import mg_globals
from mediagoblin.db.models import User
from mediagoblin.tests.tools import get_app, fixture_add_user