summaryrefslogtreecommitdiff
path: root/django/core/handlers/base.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-12-29 16:27:49 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-18 20:18:46 +0100
commit7b2f2e74adb36a4334e83130f6abc2f79d395235 (patch)
tree313387ba6a6f1311b43cf5fb4f2576d2d6c4f805 /django/core/handlers/base.py
parentf6acd1d271122d66de8061e75ae26137ddf02658 (diff)
Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
Diffstat (limited to 'django/core/handlers/base.py')
-rw-r--r--django/core/handlers/base.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index b37716b62c..c45023d129 100644
--- a/django/core/handlers/base.py
+++ b/django/core/handlers/base.py
@@ -5,7 +5,6 @@ from django.conf import settings
from django.core.exceptions import ImproperlyConfigured, MiddlewareNotUsed
from django.db import connections, transaction
from django.urls import get_resolver, set_urlconf
-from django.utils import six
from django.utils.module_loading import import_string
from .exception import convert_exception_to_response, get_exception_response
@@ -42,7 +41,7 @@ class BaseHandler(object):
mw_instance = middleware(handler)
except MiddlewareNotUsed as exc:
if settings.DEBUG:
- if six.text_type(exc):
+ if str(exc):
logger.debug('MiddlewareNotUsed(%r): %s', middleware_path, exc)
else:
logger.debug('MiddlewareNotUsed: %r', middleware_path)