From 9fab1467c734a92dfec0ccae27fe841d3b4a3c33 Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Sat, 27 Feb 2010 16:30:27 +0000 Subject: [PATCH] Removed more stray tabs in Python files. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12616 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/locale/da/formats.py | 10 +++++----- django/contrib/gis/gdal/tests/test_envelope.py | 8 ++++---- django/template/defaulttags.py | 2 +- tests/modeltests/proxy_models/models.py | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/django/conf/locale/da/formats.py b/django/conf/locale/da/formats.py index 9982014cba..ae349077ef 100644 --- a/django/conf/locale/da/formats.py +++ b/django/conf/locale/da/formats.py @@ -11,15 +11,15 @@ SHORT_DATE_FORMAT = 'd.m.Y' SHORT_DATETIME_FORMAT = 'd.m.Y H:i' FIRST_DAY_OF_WEEK = 1 DATE_INPUT_FORMATS = ( - '%d.%m.%Y', # '25.10.2006' + '%d.%m.%Y', # '25.10.2006' ) TIME_INPUT_FORMATS = ( - '%H:%M:%S', # '14:30:59' - '%H:%M', # '14:30' + '%H:%M:%S', # '14:30:59' + '%H:%M', # '14:30' ) DATETIME_INPUT_FORMATS = ( - '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' - '%d.%m.%Y %H:%M', # '25.10.2006 14:30' + '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' + '%d.%m.%Y %H:%M', # '25.10.2006 14:30' ) DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' diff --git a/django/contrib/gis/gdal/tests/test_envelope.py b/django/contrib/gis/gdal/tests/test_envelope.py index 6c0c13724c..f181fa237c 100644 --- a/django/contrib/gis/gdal/tests/test_envelope.py +++ b/django/contrib/gis/gdal/tests/test_envelope.py @@ -55,7 +55,7 @@ class EnvelopeTest(unittest.TestCase): self.assertEqual((0, 0, 5, 6), self.e) self.e.expand_to_include(-1, -1) self.assertEqual((-1, -1, 5, 6), self.e) - + def test05_expand_to_include_pt_2_tuple(self): "Testing Envelope expand_to_include -- point as a single 2-tuple parameter." self.e.expand_to_include((10, 10)) @@ -67,17 +67,17 @@ class EnvelopeTest(unittest.TestCase): "Testing Envelope expand_to_include -- extent as 4 parameters." self.e.expand_to_include(-1, 1, 3, 7) self.assertEqual((-1, 0, 5, 7), self.e) - + def test06_expand_to_include_extent_4_tuple(self): "Testing Envelope expand_to_include -- extent as a single 4-tuple parameter." self.e.expand_to_include((-1, 1, 3, 7)) self.assertEqual((-1, 0, 5, 7), self.e) - + def test07_expand_to_include_envelope(self): "Testing Envelope expand_to_include with Envelope as parameter." self.e.expand_to_include(Envelope(-1, 1, 3, 7)) self.assertEqual((-1, 0, 5, 7), self.e) - + def test08_expand_to_include_point(self): "Testing Envelope expand_to_include with Point as parameter." self.e.expand_to_include(TestPoint(-1, 1)) diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 0db77f17af..69afd84c43 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -595,7 +595,7 @@ def firstof(parser, token): {% filter force_escape %} {% firstof var1 var2 var3 "fallback value" %} - {% endfilter %} + {% endfilter %} """ bits = token.split_contents()[1:] diff --git a/tests/modeltests/proxy_models/models.py b/tests/modeltests/proxy_models/models.py index 49972f3d2c..28446b96c1 100644 --- a/tests/modeltests/proxy_models/models.py +++ b/tests/modeltests/proxy_models/models.py @@ -98,18 +98,18 @@ class UserProxyProxy(UserProxy): # We can still use `select_related()` to include related models in our querysets. class Country(models.Model): - name = models.CharField(max_length=50) + name = models.CharField(max_length=50) class State(models.Model): - name = models.CharField(max_length=50) - country = models.ForeignKey(Country) + name = models.CharField(max_length=50) + country = models.ForeignKey(Country) - def __unicode__(self): - return self.name + def __unicode__(self): + return self.name class StateProxy(State): - class Meta: - proxy = True + class Meta: + proxy = True # Proxy models still works with filters (on related fields) # and select_related, even when mixed with model inheritance