mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Cleanup E261 errors

pull/2000/head
Karl Hobley 2015-12-04 09:20:22 +00:00
rodzic 8a22c977a2
commit 113f8e59ff
10 zmienionych plików z 33 dodań i 32 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
tox.ini
Wyświetl plik

@ -5,7 +5,7 @@ usedevelop = True
envlist = py{27,33,34,35}-dj{17,18}-{sqlite,postgres,mysql}, flake8
[flake8]
ignore = E501,E128,E261,E302,E303,E124,E126
ignore = E501,E128,E302,E303,E124,E126
exclude = wagtail/project_template/*
[testenv]

8
wagtail/contrib/wagtailsearchpromotions/tests.py
Wyświetl plik

@ -205,7 +205,7 @@ class TestSearchPromotionsEditView(TestCase, WagtailTestUtils):
'editors_picks-0-DELETE': '',
'editors_picks-0-ORDER': 0,
'editors_picks-0-page': 1,
'editors_picks-0-description': "Description has changed", # Change
'editors_picks-0-description': "Description has changed", # Change
'editors_picks-1-id': self.search_pick_2.id,
'editors_picks-1-DELETE': '',
'editors_picks-1-ORDER': 1,
@ -233,12 +233,12 @@ class TestSearchPromotionsEditView(TestCase, WagtailTestUtils):
'editors_picks-MAX_NUM_FORMS': 1000,
'editors_picks-0-id': self.search_pick.id,
'editors_picks-0-DELETE': '',
'editors_picks-0-ORDER': 1, # Change
'editors_picks-0-ORDER': 1, # Change
'editors_picks-0-page': 1,
'editors_picks-0-description': "Root page",
'editors_picks-1-id': self.search_pick_2.id,
'editors_picks-1-DELETE': '',
'editors_picks-1-ORDER': 0, # Change
'editors_picks-1-ORDER': 0, # Change
'editors_picks-1-page': 2,
'editors_picks-1-description': "Homepage",
}
@ -295,7 +295,7 @@ class TestSearchPromotionsEditView(TestCase, WagtailTestUtils):
'editors_picks-0-DELETE': 1,
'editors_picks-0-ORDER': 0,
'editors_picks-0-page': 1,
'editors_picks-0-description': "Description has changed", # Change
'editors_picks-0-description': "Description has changed", # Change
'editors_picks-1-id': self.search_pick_2.id,
'editors_picks-1-DELETE': 1,
'editors_picks-1-ORDER': 1,

10
wagtail/contrib/wagtailsitemaps/tests.py
Wyświetl plik

@ -44,8 +44,8 @@ class TestSitemapGenerator(TestCase):
sitemap = Sitemap(self.site)
urls = [url['location'] for url in sitemap.get_urls()]
self.assertIn('http://localhost/', urls) # Homepage
self.assertIn('http://localhost/hello-world/', urls) # Child page
self.assertIn('http://localhost/', urls) # Homepage
self.assertIn('http://localhost/hello-world/', urls) # Child page
def test_get_urls_uses_specific(self):
# Add an event page which has an extra url in the sitemap
@ -58,8 +58,8 @@ class TestSitemapGenerator(TestCase):
sitemap = Sitemap(self.site)
urls = [url['location'] for url in sitemap.get_urls()]
self.assertIn('http://localhost/events/', urls) # Main view
self.assertIn('http://localhost/events/past/', urls) # Sub view
self.assertIn('http://localhost/events/', urls) # Main view
self.assertIn('http://localhost/events/past/', urls) # Sub view
def test_render(self):
sitemap = Sitemap(self.site)
@ -102,7 +102,7 @@ class TestSitemapView(TestCase):
second_response = self.client.get('/sitemap.xml')
self.assertEqual(second_response.status_code, 200)
self.assertTemplateNotUsed(second_response, 'wagtailsitemaps/sitemap.xml') # Sitemap should not be re rendered
self.assertTemplateNotUsed(second_response, 'wagtailsitemaps/sitemap.xml') # Sitemap should not be re rendered
# Check that the content is the same
self.assertEqual(first_response.content, second_response.content)

4
wagtail/wagtailadmin/tests/test_pages_views.py
Wyświetl plik

@ -915,7 +915,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
# Check that the moderator got an email
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(mail.outbox[0].to, ['moderator@email.com'])
self.assertEqual(mail.outbox[0].subject, 'The page "Hello world!" has been submitted for moderation') # Note: should this be "I've been edited!"?
self.assertEqual(mail.outbox[0].subject, 'The page "Hello world!" has been submitted for moderation') # Note: should this be "I've been edited!"?
def test_page_edit_post_existing_slug(self):
# This tests the existing slug checking on page edit
@ -1073,7 +1073,7 @@ class TestPageEditReordering(TestCase, WagtailTestUtils):
def test_reorder_with_validation_error(self):
post_data = {
'title': "", # Validation error
'title': "", # Validation error
'slug': 'event-page',
'date_from': '01/01/2014',

4
wagtail/wagtailadmin/views/pages.py
Wyświetl plik

@ -201,7 +201,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_
'parent_page': parent_page,
'edit_handler': edit_handler,
'preview_modes': page.preview_modes,
'form': form, # Used in unit tests
'form': form, # Used in unit tests
})
@ -295,7 +295,7 @@ def edit(request, page_id):
'edit_handler': edit_handler,
'errors_debug': errors_debug,
'preview_modes': page.preview_modes,
'form': form, # Used in unit tests
'form': form, # Used in unit tests
})

2
wagtail/wagtailimages/tests/test_admin_views.py
Wyświetl plik

@ -527,7 +527,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
"""
# Send request
response = self.client.post(reverse('wagtailimages:edit_multiple', args=(self.image.id, )), {
('image-%d-title' % self.image.id): "", # Required
('image-%d-title' % self.image.id): "", # Required
('image-%d-tags' % self.image.id): "",
}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')

2
wagtail/wagtailimages/tests/test_models.py
Wyświetl plik

@ -287,7 +287,7 @@ class TestGetWillowImage(TestCase):
# should raise a SourceImageIOError
with self.assertRaises(SourceImageIOError):
with bad_image.get_willow_image():
self.fail() # Shouldn't get here
self.fail() # Shouldn't get here
def test_closes_image(self):
# This tests that willow closes images after use

12
wagtail/wagtailsearch/backends/db.py
Wyświetl plik

@ -84,22 +84,22 @@ class DBSearch(BaseSearch):
super(DBSearch, self).__init__(params)
def reset_index(self):
pass # Not needed
pass # Not needed
def add_type(self, model):
pass # Not needed
pass # Not needed
def refresh_index(self):
pass # Not needed
pass # Not needed
def add(self, obj):
pass # Not needed
pass # Not needed
def add_bulk(self, model, obj_list):
return # Not needed
return # Not needed
def delete(self, obj):
pass # Not needed
pass # Not needed
SearchBackend = DBSearch

18
wagtail/wagtailsearch/tests/test_elasticsearch_backend.py
Wyświetl plik

@ -491,7 +491,7 @@ class TestElasticSearchResults(TestCase):
search.return_value = self.construct_search_response([])
results = self.get_results()
list(results) # Performs search
list(results) # Performs search
search.assert_any_call(
from_=0,
@ -507,7 +507,7 @@ class TestElasticSearchResults(TestCase):
search.return_value = self.construct_search_response([self.objects[0].id])
results = self.get_results()
results[10] # Performs search
results[10] # Performs search
search.assert_any_call(
from_=10,
@ -523,7 +523,7 @@ class TestElasticSearchResults(TestCase):
search.return_value = self.construct_search_response([])
results = self.get_results()[1:4]
list(results) # Performs search
list(results) # Performs search
search.assert_any_call(
from_=1,
@ -539,7 +539,7 @@ class TestElasticSearchResults(TestCase):
search.return_value = self.construct_search_response([])
results = self.get_results()[10:][:10]
list(results) # Performs search
list(results) # Performs search
search.assert_any_call(
from_=10,
@ -556,7 +556,7 @@ class TestElasticSearchResults(TestCase):
search.return_value = self.construct_search_response([self.objects[0].id])
results = self.get_results()[10:]
results[10] # Performs search
results[10] # Performs search
search.assert_any_call(
from_=20,
@ -589,9 +589,9 @@ class TestElasticSearchResults(TestCase):
self.assertEqual(len(results), 2)
@mock.patch('elasticsearch.Elasticsearch.search')
def test_duplicate_results(self, search): # Duplicates will not be removed
def test_duplicate_results(self, search): # Duplicates will not be removed
search.return_value = self.construct_search_response([self.objects[0].id, self.objects[0].id])
results = list(self.get_results()) # Must cast to list so we only create one query
results = list(self.get_results()) # Must cast to list so we only create one query
self.assertEqual(len(results), 2)
self.assertEqual(results[0], self.objects[0])
@ -600,7 +600,7 @@ class TestElasticSearchResults(TestCase):
@mock.patch('elasticsearch.Elasticsearch.search')
def test_result_order(self, search):
search.return_value = self.construct_search_response([self.objects[0].id, self.objects[1].id, self.objects[2].id])
results = list(self.get_results()) # Must cast to list so we only create one query
results = list(self.get_results()) # Must cast to list so we only create one query
self.assertEqual(results[0], self.objects[0])
self.assertEqual(results[1], self.objects[1])
@ -609,7 +609,7 @@ class TestElasticSearchResults(TestCase):
@mock.patch('elasticsearch.Elasticsearch.search')
def test_result_order_2(self, search):
search.return_value = self.construct_search_response([self.objects[2].id, self.objects[1].id, self.objects[0].id])
results = list(self.get_results()) # Must cast to list so we only create one query
results = list(self.get_results()) # Must cast to list so we only create one query
self.assertEqual(results[0], self.objects[2])
self.assertEqual(results[1], self.objects[1])

3
wagtail/wagtailsearch/views/frontend.py
Wyświetl plik

@ -85,7 +85,8 @@ def search(
return JsonResponse(search_results_json, safe=False)
else:
return JsonResponse([], safe=False)
else: # Render a template
else:
# Render a template
if request.is_ajax() and template_ajax:
template = template_ajax