Permalink
Browse files

Merge pull request #6 from stefanw/master

Fix indentation and ignore PEP8's E128
  • Loading branch information...
codysoyland committed Jul 10, 2012
2 parents 9dc9141 + 2d378d4 commit 8a5755ca0fac9f7d3c9747a1c9d1d9ba1be30b23
Showing with 5 additions and 6 deletions.
  1. +1 −1 Makefile
  2. +4 −5 phased/test_cases.py
View
@@ -1,6 +1,6 @@
export DJANGO_SETTINGS_MODULE=phased.test_settings
test:
- flake8 phased --ignore=E501
+ flake8 phased --ignore=E501,E128
coverage run --branch --source=phased `which django-admin.py` test phased
coverage report --omit=phased/test*
View
@@ -8,8 +8,8 @@
from django.http import HttpResponse
from django.middleware.cache import FetchFromCacheMiddleware, UpdateCacheMiddleware
from django.utils.cache import patch_vary_headers
-from django.template import (compile_string, Context, TemplateSyntaxError,
- RequestContext)
+from django.template import (compile_string, Context,
+ TemplateSyntaxError, RequestContext)
from django.test.client import RequestFactory
from django.test import TestCase
@@ -225,16 +225,15 @@ class PhasedRenderMiddlewareTestCase(PhasedTestCase):
def test_basic(self):
request = self.factory.get('/')
response = HttpResponse(self.template %
- dict(delimiter=settings.PHASED_SECRET_DELIMITER))
+ dict(delimiter=settings.PHASED_SECRET_DELIMITER))
response = PhasedRenderMiddleware().process_response(request, response)
self.assertEqual(response.content, 'before inside after')
def test_not_html(self):
request = self.factory.get('/')
- applied_delimiter = self.template % dict(
- delimiter=settings.PHASED_SECRET_DELIMITER)
+ applied_delimiter = self.template % dict(delimiter=settings.PHASED_SECRET_DELIMITER)
response = HttpResponse(applied_delimiter, mimetype='application/json')
response = PhasedRenderMiddleware().process_response(request, response)

0 comments on commit 8a5755c

Please sign in to comment.