Whitespace cleanup.

* Removed trailing whitespace.
* Added newline to EOF if missing.
* Removed blank lines at EOF.
* Removed some stray tabs.

django/bin/django-2to3.py

@@ -7,4 +7,3 @@ import sys
 from lib2to3.main import main
 
 sys.exit(main("django.utils.2to3_fixes"))
-

django/conf/locale/ca/formats.py

@@ -31,4 +31,3 @@ DATETIME_INPUT_FORMATS = (
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3
-

django/conf/locale/en/formats.py

@@ -41,4 +41,3 @@ DATETIME_INPUT_FORMATS = (
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3
-

django/conf/locale/en_GB/formats.py

@@ -40,4 +40,3 @@ DATETIME_INPUT_FORMATS = (
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3
-

django/conf/locale/es/formats.py

@@ -31,4 +31,3 @@ DATETIME_INPUT_FORMATS = (
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3
-

django/conf/locale/es_NI/formats.py

@@ -27,4 +27,3 @@ DATETIME_INPUT_FORMATS = (
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3
-

django/conf/locale/ml/formats.py

@@ -41,4 +41,3 @@ DATETIME_INPUT_FORMATS = (
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3
-

django/conf/urls/__init__.py

@@ -61,4 +61,3 @@ def url(regex, view, kwargs=None, name=None, prefix=''):
             if prefix:
                 view = prefix + '.' + view
         return RegexURLPattern(regex, view, kwargs, name)
-

django/contrib/auth/hashers.py

@@ -501,4 +501,3 @@ class CryptPasswordHasher(BasePasswordHasher):
             (_('salt'), salt),
             (_('hash'), mask_hash(data, show=3)),
         ])
-

django/contrib/flatpages/tests/test_forms.py

@@ -96,4 +96,3 @@ class FlatpageAdminFormTests(TestCase):
         self.assertEqual(
             f.errors,
             {'sites': [translation.ugettext('This field is required.')]})
-

django/contrib/flatpages/tests/test_middleware.py

@@ -154,5 +154,3 @@ class FlatpageMiddlewareAppendSlashTests(TestCase):
         response = self.client.get('/')
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "<p>Root</p>")
-
-

django/contrib/flatpages/tests/test_templatetags.py

@@ -133,4 +133,3 @@ class FlatpageTemplateTagTests(TestCase):
                           "{% load flatpages %}{% get_flatpages for user as flatpages asdf%}")
         self.assertRaises(TemplateSyntaxError, render,
                           "{% load flatpages %}{% get_flatpages prefix for user as flatpages asdf%}")
-

django/contrib/flatpages/tests/urls.py

@@ -5,4 +5,3 @@ urlpatterns = patterns('',
     (r'^flatpage_root', include('django.contrib.flatpages.urls')),
     (r'^accounts/', include('django.contrib.auth.urls')),
 )
-

django/contrib/formtools/tests/wizard/namedwizardtests/forms.py

@@ -49,4 +49,3 @@ class SessionContactWizard(ContactWizard):
 
 class CookieContactWizard(ContactWizard):
     storage_name = 'django.contrib.formtools.wizard.storage.cookie.CookieStorage'
-

django/contrib/formtools/tests/wizard/test_loadstorage.py

@@ -15,4 +15,3 @@ class TestLoadStorage(TestCase):
             'django.contrib.formtools.wizard.storage.idontexist.IDontExistStorage', 'wizard1')
         self.assertRaises(MissingStorage, get_storage,
             'django.contrib.formtools.wizard.storage.base.IDontExistStorage', 'wizard1')
-

django/contrib/formtools/tests/wizard/wizardtests/forms.py

@@ -63,4 +63,3 @@ class SessionContactWizard(ContactWizard):
 
 class CookieContactWizard(ContactWizard):
     storage_name = 'django.contrib.formtools.wizard.storage.cookie.CookieStorage'
-

django/contrib/gis/db/backends/spatialite/client.py

@@ -2,4 +2,3 @@ from django.db.backends.sqlite3.client import DatabaseClient
 
 class SpatiaLiteClient(DatabaseClient):
     executable_name = 'spatialite'
-

django/contrib/gis/gdal/__init__.py

@@ -52,4 +52,3 @@ try:
 except ImportError:
     # No ctypes, but don't raise an exception.
     pass
-

django/contrib/gis/gdal/base.py

@@ -33,4 +33,3 @@ class GDALBase(object):
             raise TypeError('Incompatible pointer type')
 
     ptr = property(_get_ptr, _set_ptr)
-

django/contrib/gis/gdal/prototypes/geom.py

@@ -95,4 +95,3 @@ geom_transform_to = void_output(lgdal.OGR_G_TransformTo, [c_void_p, c_void_p])
 
 # For retrieving the envelope of the geometry.
 get_envelope = env_func(lgdal.OGR_G_GetEnvelope, [c_void_p, POINTER(OGREnvelope)])
-

django/contrib/gis/geos/io.py

@@ -16,5 +16,3 @@ class WKTReader(_WKTReader):
     def read(self, wkt):
         "Returns a GEOSGeometry for the given WKT string."
         return GEOSGeometry(super(WKTReader, self).read(wkt))
-
-

django/contrib/gis/sitemaps/__init__.py

@@ -1,4 +1,3 @@
 # Geo-enabled Sitemap classes.
 from django.contrib.gis.sitemaps.georss import GeoRSSSitemap
 from django.contrib.gis.sitemaps.kml import KMLSitemap, KMZSitemap
-

django/contrib/gis/sitemaps/georss.py

@@ -50,4 +50,3 @@ class GeoRSSSitemap(Sitemap):
 
     def location(self, obj):
         return urlresolvers.reverse('django.contrib.gis.views.feed', args=(obj,))
-

django/contrib/redirects/admin.py

@@ -1,7 +1,7 @@
-
 from django.contrib import admin
 from django.contrib.redirects.models import Redirect
 
+
 class RedirectAdmin(admin.ModelAdmin):
     list_display = ('old_path', 'new_path')
     list_filter = ('site',)

django/contrib/sitemaps/management/commands/ping_google.py

@@ -11,4 +11,3 @@ class Command(BaseCommand):
         else:
             sitemap_url = None
         ping_google(sitemap_url=sitemap_url)
-

django/core/mail/backends/filebased.py

@@ -57,4 +57,3 @@ class EmailBackend(ConsoleEmailBackend):
                 self.stream.close()
         finally:
             self.stream = None
-

django/core/management/commands/sqldropindexes.py

@@ -20,4 +20,3 @@ class Command(AppCommand):
 
     def handle_app(self, app, **options):
         return '\n'.join(sql_destroy_indexes(app, self.style, connections[options.get('database')]))
-

django/core/serializers/json.py

@@ -109,4 +109,3 @@ class DjangoJSONEncoder(json.JSONEncoder):
 
 # Older, deprecated class name (for backwards compatibility purposes).
 DateTimeAwareJSONEncoder = DjangoJSONEncoder
-

django/utils/autoreload.py

@@ -179,4 +179,3 @@ def main(main_func, args=None, kwargs=None):
 
     wrapped_main_func = check_errors(main_func)
     reloader(wrapped_main_func, args, kwargs)
-

django/utils/regex_helper.py

@@ -339,4 +339,3 @@ def flatten_result(source):
         for i in range(len(result)):
             result[i] += piece
     return result, result_args
-

django/utils/safestring.py

@@ -135,4 +135,3 @@ def mark_for_escaping(s):
     if isinstance(s, (six.text_type, Promise)):
         return EscapeText(s)
     return EscapeBytes(bytes(s))
-

django/utils/translation/trans_null.py

@@ -60,4 +60,3 @@ def get_language_from_request(request, check_path=False):
 
 def get_language_from_path(request, supported=None):
     return None
-

django/views/decorators/http.py

@@ -163,4 +163,3 @@ def etag(etag_func):
 
 def last_modified(last_modified_func):
     return condition(last_modified_func=last_modified_func)
-

extras/django_bash_completion

@@ -69,4 +69,3 @@ else
 fi
 
 complete -F _python_django_completion -o default $pythons
-

tests/admin_custom_urls/urls.py

@@ -5,4 +5,3 @@ from django.contrib import admin
 urlpatterns = patterns('',
     (r'^admin/', include(admin.site.urls)),
 )
-

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())))
-

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):

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']
 

tests/aggregation/models.py

@@ -44,4 +44,3 @@ class Store(models.Model):
 
     def __str__(self):
         return self.name
-

tests/bash_completion/models.py

@@ -1 +0,0 @@
-

tests/cache/liberal_backend.py

@@ -7,4 +7,3 @@ class LiberalKeyValidationMixin(object):
 
 class CacheClass(LiberalKeyValidationMixin, LocMemCache):
     pass
-

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')
-

tests/choices/tests.py

@@ -20,4 +20,3 @@ class ChoicesTests(TestCase):
 
         a.gender = 'U'
         self.assertEqual(a.get_gender_display(), 'U')
-

tests/comment_tests/tests/__init__.py

@@ -82,4 +82,3 @@ class CommentTestCase(TestCase):
         d = self.getData()
         d.update(f.initial)
         return d
-

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)
-

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)
-

tests/createsuperuser/tests.py

@@ -53,4 +53,3 @@ class MultiDBCreatesuperuserTestCase(TestCase):
         self.assertEqual(u.email, 'joe@somewhere.org')
 
         new_io.close()
-

tests/custom_columns/models.py

@@ -43,4 +43,3 @@ class Article(models.Model):
 
     class Meta:
         ordering = ('headline',)
-

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')
-
-
-

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)
-

tests/custom_pk/models.py

@@ -45,4 +45,3 @@ class Bar(models.Model):
 
 class Foo(models.Model):
     bar = models.ForeignKey(Bar)
-

tests/decorators/models.py

@@ -1,2 +1 @@
 # A models.py so that tests run.
-

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'))
-

tests/expressions_regress/models.py

@@ -26,4 +26,3 @@ class Experiment(models.Model):
 
     def duration(self):
         return self.end - self.start
-

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)
-

tests/generic_inline_admin/models.py

@@ -72,5 +72,3 @@ class Contact(models.Model):
 #
 class EpisodePermanent(Episode):
     pass
-
-

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
-

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)
-

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)
-

tests/m2m_and_m2o/models.py

@@ -27,4 +27,3 @@ class Issue(models.Model):
 
 class UnicodeReferenceModel(models.Model):
     others = models.ManyToManyField("UnicodeReferenceModel")
-

tests/m2m_intermediary/models.py

@@ -39,4 +39,3 @@ class Writer(models.Model):
 
     def __str__(self):
         return '%s (%s)' % (self.reporter, self.position)
-

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())
-

tests/mail/models.py

@@ -1 +0,0 @@
-# This file intentionally left blank

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'
-

tests/resolve_url/tests.py

@@ -66,4 +66,3 @@ class ResolveUrlTests(TestCase):
         """
         with self.assertRaises(NoReverseMatch):
             resolve_url(lambda: 'asdf')
-

tests/urlpatterns_reverse/included_named_urls.py

@@ -9,4 +9,3 @@ urlpatterns = patterns('',
     url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
     (r'^included/', include('urlpatterns_reverse.included_named_urls2')),
 )
-

tests/urlpatterns_reverse/included_named_urls2.py

@@ -8,4 +8,3 @@ urlpatterns = patterns('',
     url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url6"),
     url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
 )
-

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')),
 )
-

tests/urlpatterns_reverse/no_urls.py

@@ -1,2 +1 @@
 #from django.conf.urls import patterns, url, include
-

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')
-

tests/validation/__init__.py

@@ -13,4 +13,3 @@ class ValidationTestCase(TestCase):
             clean()
         self.assertIn(field_name, cm.exception.message_dict)
         self.assertEqual(message, cm.exception.message_dict[field_name])
-

tests/validation/test_custom_messages.py

@@ -10,4 +10,3 @@ class CustomMessagesTest(ValidationTestCase):
     def test_custom_null_message(self):
         cmm = CustomMessagesModel()
         self.assertFieldFailsValidationWithMessage(cmm.full_clean, 'number', ['NULL'])
-

tests/validation/test_unique.py

@@ -141,4 +141,3 @@ class PerformUniqueChecksTest(TestCase):
         with self.assertRaises(ValidationError) as cm:
             m.full_clean()
         self.assertEqual(cm.exception.message_dict, {'no': ['Custom unique number message.']})
-

tests/version/tests.py

@@ -24,4 +24,3 @@ class VersionTests(TestCase):
         )
         for ver_tuple, ver_string in tuples_to_strings:
             self.assertEqual(get_version(ver_tuple), ver_string)
-

tests/view_tests/__init__.py

@@ -8,4 +8,3 @@ except_args = (b'Broken!',         # plain exception with ASCII text
                '¡Broken!',         # non-ASCII unicode data
                '¡Broken!'.encode('utf-8'), # non-ASCII, utf-8 encoded bytestring
                b'\xa1Broken!', )   # non-ASCII, latin1 bytestring
-

tests/view_tests/templatetags/debugtags.py

@@ -8,4 +8,3 @@ register = template.Library()
 @register.simple_tag
 def go_boom(arg):
     raise BrokenException(arg)
-

tests/view_tests/tests/test_specials.py

@@ -36,4 +36,3 @@ class URLHandling(TestCase):
         """
         response = self.client.get('/permanent_nonascii_redirect/')
         self.assertRedirects(response, self.redirect_target, status_code=301)
-