From 1dae4ac1778f04805c0ed62c8debb13b281ba02b Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 10 Oct 2013 16:42:30 -0400 Subject: Whitespace cleanup. * Removed trailing whitespace. * Added newline to EOF if missing. * Removed blank lines at EOF. * Removed some stray tabs. --- tests/admin_custom_urls/fixtures/actions.json | 34 +++++----- tests/admin_custom_urls/urls.py | 1 - .../custom_templates/app_template/api.py | 2 +- .../custom_templates/app_template/models.py | 2 +- .../additional_dir/additional_file.py | 2 +- .../management/commands/app_command.py | 1 - tests/admin_scripts/tests.py | 2 +- .../admin_widgets/fixtures/admin-widgets-users.xml | 2 +- tests/admin_widgets/widgetadmin.py | 5 +- tests/aggregation/models.py | 1 - tests/bash_completion/models.py | 1 - tests/cache/liberal_backend.py | 1 - tests/cache/tests.py | 1 - tests/choices/tests.py | 1 - tests/comment_tests/tests/__init__.py | 1 - tests/conditional_processing/views.py | 1 - tests/context_processors/tests.py | 1 - tests/createsuperuser/tests.py | 1 - tests/custom_columns/models.py | 1 - tests/custom_columns_regress/models.py | 3 - tests/custom_managers_regress/tests.py | 1 - tests/custom_pk/models.py | 1 - tests/decorators/models.py | 1 - tests/defaultfilters/tests.py | 2 +- tests/distinct_on_fields/tests.py | 1 - tests/expressions_regress/models.py | 1 - tests/extra_regress/models.py | 1 - tests/fixtures/fixtures/fixture2.json | 14 ++-- .../fixtures_model_package/fixtures/fixture1.json | 14 ++-- .../fixtures_model_package/fixtures/fixture2.json | 14 ++-- tests/fixtures_regress/fixtures/absolute.json | 4 +- tests/fixtures_regress/fixtures/big-fixture.json | 22 +++--- tests/fixtures_regress/fixtures/sequence.json | 6 +- tests/generic_inline_admin/models.py | 2 - tests/generic_views/test_edit.py | 1 - tests/http_utils/tests.py | 2 +- tests/i18n/resolution/models.py | 2 +- tests/initial_sql_regress/models.py | 1 - tests/known_related_objects/models.py | 1 - tests/m2m_and_m2o/models.py | 1 - tests/m2m_intermediary/models.py | 1 - tests/m2m_regress/tests.py | 1 - tests/mail/models.py | 1 - tests/migrations/test_migrations/0001_initial.py | 4 +- tests/migrations/test_migrations_2/0001_initial.py | 4 +- tests/migrations/test_state.py | 6 +- tests/multiple_database/routers.py | 1 - tests/resolve_url/tests.py | 1 - tests/tablespaces/tests.py | 2 +- tests/template_tests/templatetags/broken_tag.py | 2 +- tests/test_client/fixtures/testdata.json | 78 +++++++++++----------- tests/test_client_regress/fixtures/testdata.json | 78 +++++++++++----------- tests/urlpatterns_reverse/included_named_urls.py | 1 - tests/urlpatterns_reverse/included_named_urls2.py | 1 - .../urlpatterns_reverse/included_namespace_urls.py | 1 - tests/urlpatterns_reverse/no_urls.py | 1 - tests/urlpatterns_reverse/tests.py | 1 - tests/utils_tests/files/strip_tags1.html | 58 ++++++++-------- tests/utils_tests/files/strip_tags2.txt | 26 ++++---- tests/utils_tests/test_module/bad_module.py | 2 +- tests/utils_tests/test_module/good_module.py | 2 +- tests/validation/__init__.py | 1 - tests/validation/test_custom_messages.py | 1 - tests/validation/test_unique.py | 1 - tests/version/tests.py | 1 - tests/view_tests/__init__.py | 1 - tests/view_tests/templatetags/debugtags.py | 1 - tests/view_tests/tests/test_specials.py | 1 - 68 files changed, 197 insertions(+), 238 deletions(-) delete mode 100644 tests/mail/models.py (limited to 'tests') diff --git a/tests/admin_custom_urls/fixtures/actions.json b/tests/admin_custom_urls/fixtures/actions.json index 7c6341d71d..7eda3a3ab0 100644 --- a/tests/admin_custom_urls/fixtures/actions.json +++ b/tests/admin_custom_urls/fixtures/actions.json @@ -1,42 +1,42 @@ [ { - "pk": "delete", - "model": "admin_custom_urls.action", + "pk": "delete", + "model": "admin_custom_urls.action", "fields": { "description": "Remove things." } - }, + }, { - "pk": "rename", - "model": "admin_custom_urls.action", + "pk": "rename", + "model": "admin_custom_urls.action", "fields": { "description": "Gives things other names." } - }, + }, { - "pk": "add", - "model": "admin_custom_urls.action", + "pk": "add", + "model": "admin_custom_urls.action", "fields": { "description": "Add things." } - }, + }, { - "pk": "path/to/file/", - "model": "admin_custom_urls.action", + "pk": "path/to/file/", + "model": "admin_custom_urls.action", "fields": { "description": "An action with '/' in its name." } - }, + }, { - "pk": "path/to/html/document.html", - "model": "admin_custom_urls.action", + "pk": "path/to/html/document.html", + "model": "admin_custom_urls.action", "fields": { "description": "An action with a name similar to a HTML doc path." } - }, + }, { - "pk": "javascript:alert('Hello world');\">Click here", - "model": "admin_custom_urls.action", + "pk": "javascript:alert('Hello world');\">Click here", + "model": "admin_custom_urls.action", "fields": { "description": "An action with a name suspected of being a XSS attempt" } diff --git a/tests/admin_custom_urls/urls.py b/tests/admin_custom_urls/urls.py index 478390737d..5fe9ca89fb 100644 --- a/tests/admin_custom_urls/urls.py +++ b/tests/admin_custom_urls/urls.py @@ -5,4 +5,3 @@ from django.contrib import admin urlpatterns = patterns('', (r'^admin/', include(admin.site.urls)), ) - diff --git a/tests/admin_scripts/custom_templates/app_template/api.py b/tests/admin_scripts/custom_templates/app_template/api.py index 439d935f73..ad7ec51b0b 100644 --- a/tests/admin_scripts/custom_templates/app_template/api.py +++ b/tests/admin_scripts/custom_templates/app_template/api.py @@ -1 +1 @@ -# your API code \ No newline at end of file +# your API code diff --git a/tests/admin_scripts/custom_templates/app_template/models.py b/tests/admin_scripts/custom_templates/app_template/models.py index 92be216cfc..fcd0b215d8 100644 --- a/tests/admin_scripts/custom_templates/app_template/models.py +++ b/tests/admin_scripts/custom_templates/app_template/models.py @@ -1 +1 @@ -# whatever \ No newline at end of file +# whatever diff --git a/tests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py b/tests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py index 032f0bcd72..43c1e1436a 100644 --- a/tests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py +++ b/tests/admin_scripts/custom_templates/project_template/additional_dir/additional_file.py @@ -1 +1 @@ -# some file for {{ project_name }} test project \ No newline at end of file +# some file for {{ project_name }} test project diff --git a/tests/admin_scripts/management/commands/app_command.py b/tests/admin_scripts/management/commands/app_command.py index d26df12642..5cbddb6e96 100644 --- a/tests/admin_scripts/management/commands/app_command.py +++ b/tests/admin_scripts/management/commands/app_command.py @@ -8,4 +8,3 @@ class Command(AppCommand): def handle_app(self, app, **options): print('EXECUTE:AppCommand app=%s, options=%s' % (app, sorted(options.items()))) - diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index 9f7c8d7b54..db5f6e263e 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -1633,7 +1633,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase): for f in ('Procfile', 'additional_file.py', 'requirements.txt'): self.assertTrue(os.path.exists(os.path.join(base_path, f))) with open(os.path.join(base_path, f)) as fh: - self.assertEqual(fh.read(), + self.assertEqual(fh.read().strip(), '# some file for customtestproject test project') def test_custom_project_template_context_variables(self): diff --git a/tests/admin_widgets/fixtures/admin-widgets-users.xml b/tests/admin_widgets/fixtures/admin-widgets-users.xml index b851562a1c..f677215c6d 100644 --- a/tests/admin_widgets/fixtures/admin-widgets-users.xml +++ b/tests/admin_widgets/fixtures/admin-widgets-users.xml @@ -28,7 +28,7 @@ - + 100 Volkswagon diff --git a/tests/admin_widgets/widgetadmin.py b/tests/admin_widgets/widgetadmin.py index 5eea29654b..fa46530037 100644 --- a/tests/admin_widgets/widgetadmin.py +++ b/tests/admin_widgets/widgetadmin.py @@ -6,10 +6,12 @@ from . import models class WidgetAdmin(admin.AdminSite): pass + class CarAdmin(admin.ModelAdmin): list_display = ['make', 'model', 'owner'] list_editable = ['owner'] + class CarTireAdmin(admin.ModelAdmin): def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == "car": @@ -17,6 +19,7 @@ class CarTireAdmin(admin.ModelAdmin): return db_field.formfield(**kwargs) return super(CarTireAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) + class EventAdmin(admin.ModelAdmin): raw_id_fields = ['main_band', 'supporting_bands'] @@ -44,4 +47,4 @@ site.register(models.Advisor) site.register(models.School, SchoolAdmin) -site.register(models.Profile) \ No newline at end of file +site.register(models.Profile) diff --git a/tests/aggregation/models.py b/tests/aggregation/models.py index b4f797ee03..9710afaf11 100644 --- a/tests/aggregation/models.py +++ b/tests/aggregation/models.py @@ -44,4 +44,3 @@ class Store(models.Model): def __str__(self): return self.name - diff --git a/tests/bash_completion/models.py b/tests/bash_completion/models.py index 8b13789179..e69de29bb2 100644 --- a/tests/bash_completion/models.py +++ b/tests/bash_completion/models.py @@ -1 +0,0 @@ - diff --git a/tests/cache/liberal_backend.py b/tests/cache/liberal_backend.py index b72013c6a8..3e3ce3beeb 100644 --- a/tests/cache/liberal_backend.py +++ b/tests/cache/liberal_backend.py @@ -7,4 +7,3 @@ class LiberalKeyValidationMixin(object): class CacheClass(LiberalKeyValidationMixin, LocMemCache): pass - diff --git a/tests/cache/tests.py b/tests/cache/tests.py index 462c1b236d..d46c61df67 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -1917,4 +1917,3 @@ class TestMakeTemplateFragmentKey(TestCase): key = make_template_fragment_key('spam', ['abc:def%']) self.assertEqual(key, 'template.cache.spam.f27688177baec990cdf3fbd9d9c3f469') - diff --git a/tests/choices/tests.py b/tests/choices/tests.py index 2d612626c2..329c936c7f 100644 --- a/tests/choices/tests.py +++ b/tests/choices/tests.py @@ -20,4 +20,3 @@ class ChoicesTests(TestCase): a.gender = 'U' self.assertEqual(a.get_gender_display(), 'U') - diff --git a/tests/comment_tests/tests/__init__.py b/tests/comment_tests/tests/__init__.py index df6d60010f..2e247079f8 100644 --- a/tests/comment_tests/tests/__init__.py +++ b/tests/comment_tests/tests/__init__.py @@ -82,4 +82,3 @@ class CommentTestCase(TestCase): d = self.getData() d.update(f.initial) return d - diff --git a/tests/conditional_processing/views.py b/tests/conditional_processing/views.py index d4dc4b8cf6..2960e0533d 100644 --- a/tests/conditional_processing/views.py +++ b/tests/conditional_processing/views.py @@ -23,4 +23,3 @@ etag_view1 = condition(etag_func=lambda r: ETAG)(etag_view1) def etag_view2(request): return HttpResponse(FULL_RESPONSE) etag_view2 = etag(lambda r: ETAG)(etag_view2) - diff --git a/tests/context_processors/tests.py b/tests/context_processors/tests.py index c57c592de6..cfac38bfdc 100644 --- a/tests/context_processors/tests.py +++ b/tests/context_processors/tests.py @@ -34,4 +34,3 @@ class RequestContextProcessorTests(TestCase): self.assertContains(response, url) response = self.client.post(url, {'path': '/blah/'}) self.assertContains(response, url) - diff --git a/tests/createsuperuser/tests.py b/tests/createsuperuser/tests.py index 7303b1f2e7..f64e4d9915 100644 --- a/tests/createsuperuser/tests.py +++ b/tests/createsuperuser/tests.py @@ -53,4 +53,3 @@ class MultiDBCreatesuperuserTestCase(TestCase): self.assertEqual(u.email, 'joe@somewhere.org') new_io.close() - diff --git a/tests/custom_columns/models.py b/tests/custom_columns/models.py index 16f0563d6b..16a7838a9f 100644 --- a/tests/custom_columns/models.py +++ b/tests/custom_columns/models.py @@ -43,4 +43,3 @@ class Article(models.Model): class Meta: ordering = ('headline',) - diff --git a/tests/custom_columns_regress/models.py b/tests/custom_columns_regress/models.py index 169b2246c3..96fe71cef8 100644 --- a/tests/custom_columns_regress/models.py +++ b/tests/custom_columns_regress/models.py @@ -36,6 +36,3 @@ class Author(models.Model): class Meta: db_table = 'my author table' ordering = ('last_name','first_name') - - - diff --git a/tests/custom_managers_regress/tests.py b/tests/custom_managers_regress/tests.py index 8462e526c9..1737c52926 100644 --- a/tests/custom_managers_regress/tests.py +++ b/tests/custom_managers_regress/tests.py @@ -47,4 +47,3 @@ class CustomManagersRegressTestCase(TestCase): obj = RelatedModel.objects.get(name="xyzzy") obj.delete() self.assertEqual(len(OneToOneRestrictedModel.plain_manager.all()), 0) - diff --git a/tests/custom_pk/models.py b/tests/custom_pk/models.py index 8d5065aed8..9833b88706 100644 --- a/tests/custom_pk/models.py +++ b/tests/custom_pk/models.py @@ -45,4 +45,3 @@ class Bar(models.Model): class Foo(models.Model): bar = models.ForeignKey(Bar) - diff --git a/tests/decorators/models.py b/tests/decorators/models.py index e5a795067b..22e41b9828 100644 --- a/tests/decorators/models.py +++ b/tests/decorators/models.py @@ -1,2 +1 @@ # A models.py so that tests run. - diff --git a/tests/defaultfilters/tests.py b/tests/defaultfilters/tests.py index dcd6bb7364..adae44dad3 100644 --- a/tests/defaultfilters/tests.py +++ b/tests/defaultfilters/tests.py @@ -341,7 +341,7 @@ class DefaultFiltersTests(TestCase): self.assertEqual(urlize('before \'hi@example.com afterwards'), 'before \'hi@example.com afterwards') - # Check urlize copes with commas following URLs in quotes - see #20364 + # Check urlize copes with commas following URLs in quotes - see #20364 self.assertEqual(urlize('Email us at "hi@example.com", or phone us at +xx.yy'), 'Email us at "hi@example.com", or phone us at +xx.yy') diff --git a/tests/distinct_on_fields/tests.py b/tests/distinct_on_fields/tests.py index ec6c2d0463..392178d894 100644 --- a/tests/distinct_on_fields/tests.py +++ b/tests/distinct_on_fields/tests.py @@ -114,4 +114,3 @@ class DistinctOnTests(TestCase): # distinct + aggregate not allowed with self.assertRaises(NotImplementedError): Celebrity.objects.distinct('id').aggregate(Max('id')) - diff --git a/tests/expressions_regress/models.py b/tests/expressions_regress/models.py index 711329031d..4679dcd567 100644 --- a/tests/expressions_regress/models.py +++ b/tests/expressions_regress/models.py @@ -26,4 +26,3 @@ class Experiment(models.Model): def duration(self): return self.end - self.start - diff --git a/tests/extra_regress/models.py b/tests/extra_regress/models.py index 11996438b4..5b4250ca8d 100644 --- a/tests/extra_regress/models.py +++ b/tests/extra_regress/models.py @@ -42,4 +42,3 @@ class TestObject(models.Model): def __str__(self): return 'TestObject: %s,%s,%s' % (self.first,self.second,self.third) - diff --git a/tests/fixtures/fixtures/fixture2.json b/tests/fixtures/fixtures/fixture2.json index 01b40d7535..a697448327 100644 --- a/tests/fixtures/fixtures/fixture2.json +++ b/tests/fixtures/fixtures/fixture2.json @@ -1,17 +1,17 @@ [ { - "pk": "3", - "model": "fixtures.article", + "pk": "3", + "model": "fixtures.article", "fields": { - "headline": "Copyright is fine the way it is", + "headline": "Copyright is fine the way it is", "pub_date": "2006-06-16 14:00:00" } - }, + }, { - "pk": "4", - "model": "fixtures.article", + "pk": "4", + "model": "fixtures.article", "fields": { - "headline": "Django conquers world!", + "headline": "Django conquers world!", "pub_date": "2006-06-16 15:00:00" } } diff --git a/tests/fixtures_model_package/fixtures/fixture1.json b/tests/fixtures_model_package/fixtures/fixture1.json index 7684d84609..60ad807aac 100644 --- a/tests/fixtures_model_package/fixtures/fixture1.json +++ b/tests/fixtures_model_package/fixtures/fixture1.json @@ -1,17 +1,17 @@ [ { - "pk": "2", - "model": "fixtures_model_package.article", + "pk": "2", + "model": "fixtures_model_package.article", "fields": { - "headline": "Poker has no place on ESPN", + "headline": "Poker has no place on ESPN", "pub_date": "2006-06-16 12:00:00" } - }, + }, { - "pk": "3", - "model": "fixtures_model_package.article", + "pk": "3", + "model": "fixtures_model_package.article", "fields": { - "headline": "Time to reform copyright", + "headline": "Time to reform copyright", "pub_date": "2006-06-16 13:00:00" } } diff --git a/tests/fixtures_model_package/fixtures/fixture2.json b/tests/fixtures_model_package/fixtures/fixture2.json index 4997627385..a09bc34d62 100644 --- a/tests/fixtures_model_package/fixtures/fixture2.json +++ b/tests/fixtures_model_package/fixtures/fixture2.json @@ -1,17 +1,17 @@ [ { - "pk": "3", - "model": "fixtures_model_package.article", + "pk": "3", + "model": "fixtures_model_package.article", "fields": { - "headline": "Copyright is fine the way it is", + "headline": "Copyright is fine the way it is", "pub_date": "2006-06-16 14:00:00" } - }, + }, { - "pk": "4", - "model": "fixtures_model_package.article", + "pk": "4", + "model": "fixtures_model_package.article", "fields": { - "headline": "Django conquers world!", + "headline": "Django conquers world!", "pub_date": "2006-06-16 15:00:00" } } diff --git a/tests/fixtures_regress/fixtures/absolute.json b/tests/fixtures_regress/fixtures/absolute.json index 37ed3f6886..bdf889d333 100644 --- a/tests/fixtures_regress/fixtures/absolute.json +++ b/tests/fixtures_regress/fixtures/absolute.json @@ -1,7 +1,7 @@ [ { - "pk": "1", - "model": "fixtures_regress.absolute", + "pk": "1", + "model": "fixtures_regress.absolute", "fields": { "name": "Load Absolute Path Test" } diff --git a/tests/fixtures_regress/fixtures/big-fixture.json b/tests/fixtures_regress/fixtures/big-fixture.json index e655fbbf3f..41bd33c6b5 100644 --- a/tests/fixtures_regress/fixtures/big-fixture.json +++ b/tests/fixtures_regress/fixtures/big-fixture.json @@ -4,16 +4,16 @@ "model": "fixtures_regress.channel", "fields": { "name": "Business" - } + } }, - + { "pk": 1, "model": "fixtures_regress.article", "fields": { "title": "Article Title 1", "channels": [6] - } + } }, { "pk": 2, @@ -21,7 +21,7 @@ "fields": { "title": "Article Title 2", "channels": [6] - } + } }, { "pk": 3, @@ -29,7 +29,7 @@ "fields": { "title": "Article Title 3", "channels": [6] - } + } }, { "pk": 4, @@ -37,7 +37,7 @@ "fields": { "title": "Article Title 4", "channels": [6] - } + } }, { @@ -46,7 +46,7 @@ "fields": { "title": "Article Title 5", "channels": [6] - } + } }, { "pk": 6, @@ -54,7 +54,7 @@ "fields": { "title": "Article Title 6", "channels": [6] - } + } }, { "pk": 7, @@ -62,7 +62,7 @@ "fields": { "title": "Article Title 7", "channels": [6] - } + } }, { "pk": 8, @@ -70,7 +70,7 @@ "fields": { "title": "Article Title 8", "channels": [6] - } + } }, { "pk": 9, @@ -78,6 +78,6 @@ "fields": { "title": "Yet Another Article", "channels": [6] - } + } } ] \ No newline at end of file diff --git a/tests/fixtures_regress/fixtures/sequence.json b/tests/fixtures_regress/fixtures/sequence.json index 60bfcdd547..c45ea9420c 100644 --- a/tests/fixtures_regress/fixtures/sequence.json +++ b/tests/fixtures_regress/fixtures/sequence.json @@ -1,9 +1,9 @@ [ { - "pk": "1", - "model": "fixtures_regress.animal", + "pk": "1", + "model": "fixtures_regress.animal", "fields": { - "name": "Lion", + "name": "Lion", "latin_name": "Panthera leo", "count": 3, "weight": 1.2 diff --git a/tests/generic_inline_admin/models.py b/tests/generic_inline_admin/models.py index dedc351075..cc7de62454 100644 --- a/tests/generic_inline_admin/models.py +++ b/tests/generic_inline_admin/models.py @@ -72,5 +72,3 @@ class Contact(models.Model): # class EpisodePermanent(Episode): pass - - diff --git a/tests/generic_views/test_edit.py b/tests/generic_views/test_edit.py index 9b1ba0f865..d38f4e0f45 100644 --- a/tests/generic_views/test_edit.py +++ b/tests/generic_views/test_edit.py @@ -375,4 +375,3 @@ class DeleteViewTests(TestCase): self.fail('Should raise exception -- No redirect URL provided, and no get_absolute_url provided') except ImproperlyConfigured: pass - diff --git a/tests/http_utils/tests.py b/tests/http_utils/tests.py index 9f99c94da7..6e26134c68 100644 --- a/tests/http_utils/tests.py +++ b/tests/http_utils/tests.py @@ -47,7 +47,7 @@ class HttpUtilTests(TestCase): conditional_content_removal(req, res) self.assertEqual(b''.join(res), b'') - # Issue #20472 + # Issue #20472 abc = gzip_compress(b'abc') res = HttpResponse(abc, status=304) res['Content-Encoding'] = 'gzip' diff --git a/tests/i18n/resolution/models.py b/tests/i18n/resolution/models.py index 4287ca8617..792d600548 100644 --- a/tests/i18n/resolution/models.py +++ b/tests/i18n/resolution/models.py @@ -1 +1 @@ -# \ No newline at end of file +# diff --git a/tests/initial_sql_regress/models.py b/tests/initial_sql_regress/models.py index 76de6d3bcb..f23ceefce3 100644 --- a/tests/initial_sql_regress/models.py +++ b/tests/initial_sql_regress/models.py @@ -7,4 +7,3 @@ from django.db import models class Simple(models.Model): name = models.CharField(max_length = 50) - diff --git a/tests/known_related_objects/models.py b/tests/known_related_objects/models.py index e256cc38f2..cfee4650d9 100644 --- a/tests/known_related_objects/models.py +++ b/tests/known_related_objects/models.py @@ -20,4 +20,3 @@ class Pool(models.Model): class PoolStyle(models.Model): name = models.CharField(max_length=30) pool = models.OneToOneField(Pool) - diff --git a/tests/m2m_and_m2o/models.py b/tests/m2m_and_m2o/models.py index 99c7b01017..c303743f04 100644 --- a/tests/m2m_and_m2o/models.py +++ b/tests/m2m_and_m2o/models.py @@ -27,4 +27,3 @@ class Issue(models.Model): class UnicodeReferenceModel(models.Model): others = models.ManyToManyField("UnicodeReferenceModel") - diff --git a/tests/m2m_intermediary/models.py b/tests/m2m_intermediary/models.py index e9ae422afb..770681f91c 100644 --- a/tests/m2m_intermediary/models.py +++ b/tests/m2m_intermediary/models.py @@ -39,4 +39,3 @@ class Writer(models.Model): def __str__(self): return '%s (%s)' % (self.reporter, self.position) - diff --git a/tests/m2m_regress/tests.py b/tests/m2m_regress/tests.py index 610f01694a..eaba53a5b4 100644 --- a/tests/m2m_regress/tests.py +++ b/tests/m2m_regress/tests.py @@ -108,4 +108,3 @@ class M2MRegressionTests(TestCase): worksheet.lines = hi self.assertEqual(1, worksheet.lines.count()) self.assertEqual(1, hi.count()) - diff --git a/tests/mail/models.py b/tests/mail/models.py deleted file mode 100644 index 7ff128fa69..0000000000 --- a/tests/mail/models.py +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/tests/migrations/test_migrations/0001_initial.py b/tests/migrations/test_migrations/0001_initial.py index f20bac8aec..344bebdfe3 100644 --- a/tests/migrations/test_migrations/0001_initial.py +++ b/tests/migrations/test_migrations/0001_initial.py @@ -2,7 +2,7 @@ from django.db import migrations, models class Migration(migrations.Migration): - + operations = [ migrations.CreateModel( @@ -23,5 +23,5 @@ class Migration(migrations.Migration): ("fluffy", models.BooleanField(default=True)), ], ) - + ] diff --git a/tests/migrations/test_migrations_2/0001_initial.py b/tests/migrations/test_migrations_2/0001_initial.py index 94c4bc0746..6172f011e8 100644 --- a/tests/migrations/test_migrations_2/0001_initial.py +++ b/tests/migrations/test_migrations_2/0001_initial.py @@ -4,7 +4,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [("migrations", "0002_second")] - + operations = [ migrations.CreateModel( @@ -17,5 +17,5 @@ class Migration(migrations.Migration): ("silly_field", models.BooleanField(default=False)), ], ), - + ] diff --git a/tests/migrations/test_state.py b/tests/migrations/test_state.py index 210897dc66..7c6e7a26b5 100644 --- a/tests/migrations/test_state.py +++ b/tests/migrations/test_state.py @@ -45,7 +45,7 @@ class StateTests(TestCase): author_state = project_state.models['migrations', 'author'] author_proxy_state = project_state.models['migrations', 'authorproxy'] book_state = project_state.models['migrations', 'book'] - + self.assertEqual(author_state.app_label, "migrations") self.assertEqual(author_state.name, "Author") self.assertEqual([x for x, y in author_state.fields], ["id", "name", "bio", "age"]) @@ -54,7 +54,7 @@ class StateTests(TestCase): self.assertEqual(author_state.fields[3][1].null, True) self.assertEqual(author_state.options, {"unique_together": set(("name", "bio"))}) self.assertEqual(author_state.bases, (models.Model, )) - + self.assertEqual(book_state.app_label, "migrations") self.assertEqual(book_state.name, "Book") self.assertEqual([x for x, y in book_state.fields], ["id", "title", "author"]) @@ -62,7 +62,7 @@ class StateTests(TestCase): self.assertEqual(book_state.fields[2][1].null, False) self.assertEqual(book_state.options, {"verbose_name": "tome", "db_table": "test_tome"}) self.assertEqual(book_state.bases, (models.Model, )) - + self.assertEqual(author_proxy_state.app_label, "migrations") self.assertEqual(author_proxy_state.name, "AuthorProxy") self.assertEqual(author_proxy_state.fields, []) diff --git a/tests/multiple_database/routers.py b/tests/multiple_database/routers.py index 5d15b5d6b0..8a84e0b3d2 100644 --- a/tests/multiple_database/routers.py +++ b/tests/multiple_database/routers.py @@ -58,4 +58,3 @@ class WriteRouter(object): # A router that only expresses an opinion on writes def db_for_write(self, model, **hints): return 'writer' - diff --git a/tests/resolve_url/tests.py b/tests/resolve_url/tests.py index 70f9e51781..92010f87ed 100644 --- a/tests/resolve_url/tests.py +++ b/tests/resolve_url/tests.py @@ -66,4 +66,3 @@ class ResolveUrlTests(TestCase): """ with self.assertRaises(NoReverseMatch): resolve_url(lambda: 'asdf') - diff --git a/tests/tablespaces/tests.py b/tests/tablespaces/tests.py index 088938ca1d..401195b5c3 100644 --- a/tests/tablespaces/tests.py +++ b/tests/tablespaces/tests.py @@ -6,7 +6,7 @@ from django.conf import settings from django.db import connection from django.db import models from django.db.models.loading import cache -from django.core.management.color import no_style +from django.core.management.color import no_style from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature from .models import Article, ArticleRef, Authors, Reviewers, Scientist, ScientistRef diff --git a/tests/template_tests/templatetags/broken_tag.py b/tests/template_tests/templatetags/broken_tag.py index d69ddaeb2c..c70e183f0e 100644 --- a/tests/template_tests/templatetags/broken_tag.py +++ b/tests/template_tests/templatetags/broken_tag.py @@ -1 +1 @@ -from django import Xtemplate \ No newline at end of file +from django import Xtemplate diff --git a/tests/test_client/fixtures/testdata.json b/tests/test_client/fixtures/testdata.json index 0dcf625939..b844809a18 100644 --- a/tests/test_client/fixtures/testdata.json +++ b/tests/test_client/fixtures/testdata.json @@ -1,55 +1,55 @@ [ { - "pk": "1", - "model": "auth.user", + "pk": "1", + "model": "auth.user", "fields": { - "username": "testclient", - "first_name": "Test", - "last_name": "Client", - "is_active": true, - "is_superuser": false, - "is_staff": false, - "last_login": "2006-12-17 07:03:31", - "groups": [], - "user_permissions": [], - "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", - "email": "testclient@example.com", + "username": "testclient", + "first_name": "Test", + "last_name": "Client", + "is_active": true, + "is_superuser": false, + "is_staff": false, + "last_login": "2006-12-17 07:03:31", + "groups": [], + "user_permissions": [], + "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", + "email": "testclient@example.com", "date_joined": "2006-12-17 07:03:31" } }, { - "pk": "2", - "model": "auth.user", + "pk": "2", + "model": "auth.user", "fields": { - "username": "inactive", - "first_name": "Inactive", - "last_name": "User", - "is_active": false, - "is_superuser": false, - "is_staff": false, - "last_login": "2006-12-17 07:03:31", - "groups": [], - "user_permissions": [], - "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", - "email": "testclient@example.com", + "username": "inactive", + "first_name": "Inactive", + "last_name": "User", + "is_active": false, + "is_superuser": false, + "is_staff": false, + "last_login": "2006-12-17 07:03:31", + "groups": [], + "user_permissions": [], + "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", + "email": "testclient@example.com", "date_joined": "2006-12-17 07:03:31" } }, { - "pk": "3", - "model": "auth.user", + "pk": "3", + "model": "auth.user", "fields": { - "username": "staff", - "first_name": "Staff", - "last_name": "Member", - "is_active": true, - "is_superuser": false, - "is_staff": true, - "last_login": "2006-12-17 07:03:31", - "groups": [], - "user_permissions": [], - "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", - "email": "testclient@example.com", + "username": "staff", + "first_name": "Staff", + "last_name": "Member", + "is_active": true, + "is_superuser": false, + "is_staff": true, + "last_login": "2006-12-17 07:03:31", + "groups": [], + "user_permissions": [], + "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", + "email": "testclient@example.com", "date_joined": "2006-12-17 07:03:31" } } diff --git a/tests/test_client_regress/fixtures/testdata.json b/tests/test_client_regress/fixtures/testdata.json index 0dcf625939..b844809a18 100644 --- a/tests/test_client_regress/fixtures/testdata.json +++ b/tests/test_client_regress/fixtures/testdata.json @@ -1,55 +1,55 @@ [ { - "pk": "1", - "model": "auth.user", + "pk": "1", + "model": "auth.user", "fields": { - "username": "testclient", - "first_name": "Test", - "last_name": "Client", - "is_active": true, - "is_superuser": false, - "is_staff": false, - "last_login": "2006-12-17 07:03:31", - "groups": [], - "user_permissions": [], - "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", - "email": "testclient@example.com", + "username": "testclient", + "first_name": "Test", + "last_name": "Client", + "is_active": true, + "is_superuser": false, + "is_staff": false, + "last_login": "2006-12-17 07:03:31", + "groups": [], + "user_permissions": [], + "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", + "email": "testclient@example.com", "date_joined": "2006-12-17 07:03:31" } }, { - "pk": "2", - "model": "auth.user", + "pk": "2", + "model": "auth.user", "fields": { - "username": "inactive", - "first_name": "Inactive", - "last_name": "User", - "is_active": false, - "is_superuser": false, - "is_staff": false, - "last_login": "2006-12-17 07:03:31", - "groups": [], - "user_permissions": [], - "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", - "email": "testclient@example.com", + "username": "inactive", + "first_name": "Inactive", + "last_name": "User", + "is_active": false, + "is_superuser": false, + "is_staff": false, + "last_login": "2006-12-17 07:03:31", + "groups": [], + "user_permissions": [], + "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", + "email": "testclient@example.com", "date_joined": "2006-12-17 07:03:31" } }, { - "pk": "3", - "model": "auth.user", + "pk": "3", + "model": "auth.user", "fields": { - "username": "staff", - "first_name": "Staff", - "last_name": "Member", - "is_active": true, - "is_superuser": false, - "is_staff": true, - "last_login": "2006-12-17 07:03:31", - "groups": [], - "user_permissions": [], - "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", - "email": "testclient@example.com", + "username": "staff", + "first_name": "Staff", + "last_name": "Member", + "is_active": true, + "is_superuser": false, + "is_staff": true, + "last_login": "2006-12-17 07:03:31", + "groups": [], + "user_permissions": [], + "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", + "email": "testclient@example.com", "date_joined": "2006-12-17 07:03:31" } } diff --git a/tests/urlpatterns_reverse/included_named_urls.py b/tests/urlpatterns_reverse/included_named_urls.py index 366fe9b57a..14d2525114 100644 --- a/tests/urlpatterns_reverse/included_named_urls.py +++ b/tests/urlpatterns_reverse/included_named_urls.py @@ -9,4 +9,3 @@ urlpatterns = patterns('', url(r'^(?P\d+)|(?P\d+)/$', empty_view), (r'^included/', include('urlpatterns_reverse.included_named_urls2')), ) - diff --git a/tests/urlpatterns_reverse/included_named_urls2.py b/tests/urlpatterns_reverse/included_named_urls2.py index b8e4c531fa..897d9e7487 100644 --- a/tests/urlpatterns_reverse/included_named_urls2.py +++ b/tests/urlpatterns_reverse/included_named_urls2.py @@ -8,4 +8,3 @@ urlpatterns = patterns('', url(r'^extra/(?P\w+)/$', empty_view, name="named-url6"), url(r'^(?P\d+)|(?P\d+)/$', empty_view), ) - diff --git a/tests/urlpatterns_reverse/included_namespace_urls.py b/tests/urlpatterns_reverse/included_namespace_urls.py index ae098a64dc..aaa1a03687 100644 --- a/tests/urlpatterns_reverse/included_namespace_urls.py +++ b/tests/urlpatterns_reverse/included_namespace_urls.py @@ -21,4 +21,3 @@ urlpatterns = patterns('urlpatterns_reverse.views', (r'^ns-included3/', include('urlpatterns_reverse.included_urls', namespace='inc-ns3')), (r'^ns-included4/', include('urlpatterns_reverse.namespace_urls', namespace='inc-ns4')), ) - diff --git a/tests/urlpatterns_reverse/no_urls.py b/tests/urlpatterns_reverse/no_urls.py index 5b1959c7dc..1cd34c78f7 100644 --- a/tests/urlpatterns_reverse/no_urls.py +++ b/tests/urlpatterns_reverse/no_urls.py @@ -1,2 +1 @@ #from django.conf.urls import patterns, url, include - diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py index 4d77dc946d..9ed1e8f714 100644 --- a/tests/urlpatterns_reverse/tests.py +++ b/tests/urlpatterns_reverse/tests.py @@ -656,4 +656,3 @@ class ViewLoadingTests(TestCase): # swallow it. self.assertRaises(AttributeError, get_callable, 'urlpatterns_reverse.views_broken.i_am_broken') - diff --git a/tests/utils_tests/files/strip_tags1.html b/tests/utils_tests/files/strip_tags1.html index 8e9ee1d8fd..5e191f31fd 100644 --- a/tests/utils_tests/files/strip_tags1.html +++ b/tests/utils_tests/files/strip_tags1.html @@ -13,7 +13,7 @@ - + @@ -21,12 +21,12 @@ - + - + @@ -89,9 +89,9 @@ - - + +