mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

[1.1.X] Removed more stray tabs in Python files.

Browse Source 
Applicable parts of r12616 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey 2010-02-27 16:37:32 +00:00
parent aa8a98564c
commit e0679ef165
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/contrib/gis/gdal/tests/test_envelope.py
View File

@ -55,7 +55,7 @@ class EnvelopeTest(unittest.TestCase):
self.assertEqual((0, 0, 5, 6), self.e) self.assertEqual((0, 0, 5, 6), self.e)
self.e.expand_to_include(-1, -1) self.e.expand_to_include(-1, -1)
self.assertEqual((-1, -1, 5, 6), self.e) self.assertEqual((-1, -1, 5, 6), self.e)
def test05_expand_to_include_pt_2_tuple(self): def test05_expand_to_include_pt_2_tuple(self):
"Testing Envelope expand_to_include -- point as a single 2-tuple parameter." "Testing Envelope expand_to_include -- point as a single 2-tuple parameter."
self.e.expand_to_include((10, 10)) self.e.expand_to_include((10, 10))
@ -67,17 +67,17 @@ class EnvelopeTest(unittest.TestCase):
"Testing Envelope expand_to_include -- extent as 4 parameters." "Testing Envelope expand_to_include -- extent as 4 parameters."
self.e.expand_to_include(-1, 1, 3, 7) self.e.expand_to_include(-1, 1, 3, 7)
self.assertEqual((-1, 0, 5, 7), self.e) self.assertEqual((-1, 0, 5, 7), self.e)
def test06_expand_to_include_extent_4_tuple(self): def test06_expand_to_include_extent_4_tuple(self):
"Testing Envelope expand_to_include -- extent as a single 4-tuple parameter." "Testing Envelope expand_to_include -- extent as a single 4-tuple parameter."
self.e.expand_to_include((-1, 1, 3, 7)) self.e.expand_to_include((-1, 1, 3, 7))
self.assertEqual((-1, 0, 5, 7), self.e) self.assertEqual((-1, 0, 5, 7), self.e)
def test07_expand_to_include_envelope(self): def test07_expand_to_include_envelope(self):
"Testing Envelope expand_to_include with Envelope as parameter." "Testing Envelope expand_to_include with Envelope as parameter."
self.e.expand_to_include(Envelope(-1, 1, 3, 7)) self.e.expand_to_include(Envelope(-1, 1, 3, 7))
self.assertEqual((-1, 0, 5, 7), self.e) self.assertEqual((-1, 0, 5, 7), self.e)
def test08_expand_to_include_point(self): def test08_expand_to_include_point(self):
"Testing Envelope expand_to_include with Point as parameter." "Testing Envelope expand_to_include with Point as parameter."
self.e.expand_to_include(TestPoint(-1, 1)) self.e.expand_to_include(TestPoint(-1, 1))

2
django/template/defaulttags.py
View File

@ -603,7 +603,7 @@ def firstof(parser, token):
{% filter force_escape %} {% filter force_escape %}
{% firstof var1 var2 var3 "fallback value" %} {% firstof var1 var2 var3 "fallback value" %}
{% endfilter %} {% endfilter %}
""" """
bits = token.split_contents()[1:] bits = token.split_contents()[1:]

14
tests/modeltests/proxy_models/models.py
View File

@ -98,18 +98,18 @@ class UserProxyProxy(UserProxy):
# We can still use `select_related()` to include related models in our querysets. # We can still use `select_related()` to include related models in our querysets.
class Country(models.Model): class Country(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
class State(models.Model): class State(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
country = models.ForeignKey(Country) country = models.ForeignKey(Country)
def __unicode__(self): def __unicode__(self):
return self.name return self.name
class StateProxy(State): class StateProxy(State):
class Meta: class Meta:
proxy = True proxy = True
# Proxy models still works with filters (on related fields) # Proxy models still works with filters (on related fields)
# and select_related, even when mixed with model inheritance # and select_related, even when mixed with model inheritance