aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar/utils
diff options
context:
space:
mode:
authorAymeric Augustin2013-10-16 23:11:26 +0200
committerAymeric Augustin2013-10-17 18:24:58 +0200
commit87a73758431a417f6f1aa7313260e1049549f713 (patch)
treeb9cfaf7ac9075502ff119284ab4696711e920ca3 /debug_toolbar/utils
parent21e21aa088cde88cc5c690fa1f931a6208a8112a (diff)
downloaddjango-debug-toolbar-87a73758431a417f6f1aa7313260e1049549f713.tar.bz2
Update imports for renamed modules.
Diffstat (limited to 'debug_toolbar/utils')
-rw-r--r--debug_toolbar/utils/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/debug_toolbar/utils/__init__.py b/debug_toolbar/utils/__init__.py
index 7efb106..ebd8b84 100644
--- a/debug_toolbar/utils/__init__.py
+++ b/debug_toolbar/utils/__init__.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
import inspect
import os.path
import django
-import SocketServer
import sys
from django.conf import settings
@@ -11,10 +10,11 @@ from django.views.debug import linebreak_iter
from django.utils.html import escape
from django.utils.safestring import mark_safe
from django.utils import six
+from django.utils.six.moves import socketserver
# Figure out some paths
django_path = os.path.realpath(os.path.dirname(django.__file__))
-socketserver_path = os.path.realpath(os.path.dirname(SocketServer.__file__))
+socketserver_path = os.path.realpath(os.path.dirname(socketserver.__file__))
def ms_from_timedelta(td):
@@ -31,7 +31,7 @@ def tidy_stacktrace(stack):
"""
Clean up stacktrace and remove all entries that:
1. Are part of Django (except contrib apps)
- 2. Are part of SocketServer (used by Django's dev server)
+ 2. Are part of socketserver (used by Django's dev server)
3. Are the last entry (which is part of our stacktracing code)
``stack`` should be a list of frame tuples from ``inspect.stack()``