aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAymeric Augustin2013-10-27 13:05:52 +0100
committerAymeric Augustin2013-10-27 13:05:52 +0100
commitc0bd74252e717c4a93d333467253ef9b5c66dcb5 (patch)
tree1eb2973eef656b171495d52fb493e29a3b52dea8
parent9cb9796791062c9d208c0f887dc65142d42c022a (diff)
downloaddjango-debug-toolbar-c0bd74252e717c4a93d333467253ef9b5c66dcb5.tar.bz2
Fix all flake8 warnings and add flake8 to tox.
-rw-r--r--debug_toolbar/utils/__init__.py1
-rw-r--r--debug_toolbar/utils/tracking/db.py1
-rw-r--r--debug_toolbar/views.py3
-rw-r--r--setup.cfg1
-rw-r--r--tox.ini8
5 files changed, 9 insertions, 5 deletions
diff --git a/debug_toolbar/utils/__init__.py b/debug_toolbar/utils/__init__.py
index c421dce..cec20ad 100644
--- a/debug_toolbar/utils/__init__.py
+++ b/debug_toolbar/utils/__init__.py
@@ -5,7 +5,6 @@ import os.path
import django
import sys
-from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.utils.encoding import force_text
from django.utils.html import escape
diff --git a/debug_toolbar/utils/tracking/db.py b/debug_toolbar/utils/tracking/db.py
index b195f4a..7b8092c 100644
--- a/debug_toolbar/utils/tracking/db.py
+++ b/debug_toolbar/utils/tracking/db.py
@@ -6,7 +6,6 @@ import json
from threading import local
from time import time
-from django.conf import settings
from django.template import Node
from django.utils.encoding import force_text
from django.utils import six
diff --git a/debug_toolbar/views.py b/debug_toolbar/views.py
index 436cb07..8b3e63c 100644
--- a/debug_toolbar/views.py
+++ b/debug_toolbar/views.py
@@ -132,7 +132,7 @@ def template_source(request):
if template_name is None:
return HttpResponseBadRequest('"template" key is required')
- from django.template.loader import find_template_loader, make_origin
+ from django.template.loader import find_template_loader
loaders = []
for loader_name in settings.TEMPLATE_LOADERS:
loader = find_template_loader(loader_name)
@@ -141,7 +141,6 @@ def template_source(request):
for loader in loaders:
try:
source, display_name = loader.load_template_source(template_name)
- origin = make_origin(display_name, loader, template_name, settings.TEMPLATE_DIRS)
break
except TemplateDoesNotExist:
source = "Template Does Not Exist: %s" % (template_name,)
diff --git a/setup.cfg b/setup.cfg
index f09e37b..dfc2ec0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,4 +2,5 @@
tag_svn_revision = false
[flake8]
+ignore = W601 ; # noqa doesn't silence this one
max-line-length = 100
diff --git a/tox.ini b/tox.ini
index cfb8b5e..0b81d1c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,8 @@ envlist =
py33-django15,
py27-django16,
py32-django16,
- py33-django16
+ py33-django16,
+ flake8
[testenv]
commands = python runtests.py
@@ -68,3 +69,8 @@ basepython = python3.3
deps =
https://www.djangoproject.com/download/1.6c1/tarball/
{[testenv]deps}
+
+[testenv:flake8]
+commands = flake8 debug_toolbar example tests
+deps =
+ flake8