Lint fixes.

subdomains/compat/template.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 import re
 import functools
 from inspect import getargspec

subdomains/compat/tests.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 from functools import wraps
 
 from django.conf import settings, UserSettingsHolder
@@ -26,6 +27,7 @@ def __call__(self, test_func):
         if isinstance(test_func, type) and issubclass(test_func, TransactionTestCase):
             original_pre_setup = test_func._pre_setup
             original_post_teardown = test_func._post_teardown
+
             def _pre_setup(innerself):
                 self.enable()
                 original_pre_setup(innerself)

subdomains/tests/tests.py

@@ -3,19 +3,18 @@
 
 from django.contrib.sites.models import Site
 from django.core.urlresolvers import NoReverseMatch
-from django.http import HttpRequest
 from django.test import TestCase
 from django.template import Context, Template
 
 try:
     from django.test.client import RequestFactory
 except ImportError:
-    from subdomains.compat.requestfactory import RequestFactory
+    from subdomains.compat.requestfactory import RequestFactory  # noqa
 
 try:
     from django.test.utils import override_settings
 except ImportError:
-    from subdomains.compat.tests import override_settings
+    from subdomains.compat.tests import override_settings  # noqa
 
 from subdomains.middleware import (SubdomainMiddleware,
     SubdomainURLRoutingMiddleware)
@@ -205,35 +204,40 @@ def test_reverse_subdomain_mismatch(self):
 
     def test_reverse_invalid_urlconf_argument(self):
         self.assertRaises(ValueError,
-            lambda: reverse('home', urlconf=self.get_path_to_urlconf('marketing')))
+            lambda: reverse('home',
+                urlconf=self.get_path_to_urlconf('marketing')))
 
 
 class SubdomainTemplateTagTestCase(SubdomainTestMixin, TestCase):
+    def make_template(self, template):
+        return Template('{% load subdomainurls %}' + template)
+
     def test_without_subdomain(self):
         defaults = {'view': 'home'}
-        template = Template('{% load subdomainurls %}{% url view %}')
+        template = self.make_template('{% url view %}')
 
         context = Context(defaults)
         rendered = template.render(context).strip()
         self.assertEqual(rendered, 'http://%s/' % self.DOMAIN)
 
     def test_with_subdomain(self):
         defaults = {'view': 'home'}
-        template = Template('{% load subdomainurls %}{% url view subdomain=subdomain %}')
+        template = self.make_template('{% url view subdomain=subdomain %}')
 
         for subdomain in ('www', 'api', 'wildcard'):
             context = Context(dict(defaults, subdomain=subdomain))
             rendered = template.render(context).strip()
-            self.assertEqual(rendered, 'http://%s.%s/' % (subdomain, self.DOMAIN))
+            self.assertEqual(rendered,
+                'http://%s.%s/' % (subdomain, self.DOMAIN))
 
     def test_no_reverse(self):
-        template = Template('{% load subdomainurls %}{% url view subdomain=subdomain %}')
+        template = self.make_template('{% url view subdomain=subdomain %}')
 
         context = Context({'view': '__invalid__'})
         self.assertRaises(NoReverseMatch, lambda: template.render(context))
 
     def test_implied_subdomain_from_request(self):
-        template = Template('{% load subdomainurls %}{% url view %}')
+        template = self.make_template('{% url view %}')
         defaults = {'view': 'home'}
 
         request = mock.Mock()
@@ -249,4 +253,5 @@ def test_implied_subdomain_from_request(self):
 
             context = Context(dict(defaults, request=request))
             rendered = template.render(context).strip()
-            self.assertEqual(rendered, 'http://%s.%s/' % (subdomain, self.DOMAIN))
+            self.assertEqual(rendered,
+                'http://%s.%s/' % (subdomain, self.DOMAIN))

subdomains/tests/urls/api.py

@@ -1,7 +1,7 @@
 try:
     from django.conf.urls import patterns, url
 except ImportError:
-    from django.conf.urls.defaults import patterns, url
+    from django.conf.urls.defaults import patterns, url  # noqa
 
 from subdomains.tests.urls.default import urlpatterns as default_patterns
 from subdomains.tests.views import view

subdomains/tests/urls/application.py

@@ -1,7 +1,7 @@
 try:
     from django.conf.urls import patterns, url
 except ImportError:
-    from django.conf.urls.defaults import patterns, url
+    from django.conf.urls.defaults import patterns, url  # noqa
 
 from subdomains.tests.urls.default import urlpatterns as default_patterns
 from subdomains.tests.views import view

subdomains/tests/urls/default.py

@@ -1,7 +1,7 @@
 try:
     from django.conf.urls import patterns, url
 except ImportError:
-    from django.conf.urls.defaults import patterns, url
+    from django.conf.urls.defaults import patterns, url  # noqa
 
 from subdomains.tests.views import view
 

subdomains/tests/urls/marketing.py

@@ -1,8 +1,9 @@
 try:
     from django.conf.urls import patterns, url
 except ImportError:
-    from django.conf.urls.defaults import patterns, url
+    from django.conf.urls.defaults import patterns, url  # noqa
 
 from subdomains.tests.urls.default import urlpatterns as default_patterns
 
+
 urlpatterns = default_patterns