From 4c39a9d35f45293a549c60993cd0c341180a486d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 12 Aug 2019 13:58:48 +0200 Subject: [PATCH] misc: use django.utils.six (#35368) --- debian/control | 3 +-- hobo/environment/utils.py | 3 +-- tox.ini | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 9f34852..4445a04 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,7 @@ Depends: ${misc:Depends}, python-prometheus-client, python-djangorestframework, python-dnspython, - python-systemd, - python-six + python-systemd Recommends: python-gadjo, python-django-mellon (>= 1.2.22.26), diff --git a/hobo/environment/utils.py b/hobo/environment/utils.py index 349ae92..c7e2c0d 100644 --- a/hobo/environment/utils.py +++ b/hobo/environment/utils.py @@ -1,8 +1,7 @@ -from six.moves.urllib.parse import urlparse - from django.conf import settings from django.core.urlresolvers import reverse from django.db import connection +from django.utils.six.moves.urllib.parse import urlparse from hobo.middleware.utils import StoreRequestMiddleware diff --git a/tox.ini b/tox.ini index a91ea84..6867269 100644 --- a/tox.ini +++ b/tox.ini @@ -52,7 +52,6 @@ deps: httmock requests pytest-freezegun - six commands = ./getlasso.sh hobo: py.test {env:COVERAGE:} {env:NOMIGRATIONS:} {posargs:tests/}