Skip to content

Commit

Permalink
Merge pull request #217 from rsalmaso/django3
Browse files Browse the repository at this point in the history
Remove django.utils.six import (removed in django 3.0)
  • Loading branch information
evansd committed Apr 24, 2019
2 parents 0e94fc1 + c4ad0bb commit 9cb0abb
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion whitenoise/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
from django.contrib.staticfiles.storage import staticfiles_storage
from django.contrib.staticfiles import finders
from django.http import FileResponse
from django.utils.six.moves.urllib.parse import urlparse
try:
from urllib.parse import urlparse # PY3
except ImportError:
from urlparse import urlparse # PY2

from .base import WhiteNoise
from .string_utils import decode_if_byte_string, ensure_leading_trailing_slash
Expand Down

0 comments on commit 9cb0abb

Please sign in to comment.