use urljoin from standard Python

shop/models/defaults/order.py

@@ -3,9 +3,10 @@
 
 import binascii
 from os import urandom
+from urllib.parse import urljoin
+
 from django.db import models
 from django.utils import timezone
-from django.utils.six.moves.urllib.parse import urljoin
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from shop.models import order
 

shop/models/order.py

@@ -3,7 +3,9 @@
 
 from decimal import Decimal
 import logging
+from urllib.parse import urljoin
 from six import with_metaclass
+
 from django.core import checks
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models, transaction
@@ -12,7 +14,7 @@
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy, get_language_from_request
-from django.utils.six.moves.urllib.parse import urljoin
+
 from django_fsm import FSMField, transition
 from ipware.ip import get_ip
 from cms.models import Page

shop/models/product.py

@@ -4,6 +4,8 @@
 from distutils.version import LooseVersion
 from functools import reduce
 import operator
+from urllib.parse import urljoin
+
 from cms import __version__ as CMS_VERSION
 
 from django.apps import apps
@@ -15,7 +17,6 @@
 from django.utils import six
 from django.utils import timezone
 from django.utils.encoding import force_text
-from django.utils.six.moves.urllib.parse import urljoin
 from django.utils.translation import ugettext_lazy as _
 
 try: