Author: jacob
Date: 2008-08-30 14:25:40 -0500 (Sat, 30 Aug 2008)
New Revision: 8746
Modified:
django/trunk/django/contrib/sites/tests.py
django/trunk/django/utils/text.py
django/trunk/tests/regressiontests/templates/tests.py
Log:
Fixed #8710: removed a few stray tabs. Thanks, gkelly.
Modified: django/trunk/django/contrib/sites/tests.py
===================================================================
--- django/trunk/django/contrib/sites/tests.py 2008-08-30 19:10:07 UTC (rev
8745)
+++ django/trunk/django/contrib/sites/tests.py 2008-08-30 19:25:40 UTC (rev
8746)
@@ -2,7 +2,7 @@
>>> from django.contrib.sites.models import Site
>>> from django.conf import settings
>>> Site(id=settings.SITE_ID, domain="example.com", name="example.com").save()
-
+
>>> # Make sure that get_current() does not return a deleted Site object.
>>> s = Site.objects.get_current()
>>> isinstance(s, Site)
Modified: django/trunk/django/utils/text.py
===================================================================
--- django/trunk/django/utils/text.py 2008-08-30 19:10:07 UTC (rev 8745)
+++ django/trunk/django/utils/text.py 2008-08-30 19:25:40 UTC (rev 8746)
@@ -207,10 +207,10 @@
>>> list(smart_split(r'This is "a person\'s" test.'))
[u'This', u'is', u'"a person\\\'s"', u'test.']
- >>> list(smart_split(r"Another 'person\'s' test."))
- [u'Another', u"'person's'", u'test.']
- >>> list(smart_split(r'A "\"funky\" style" test.'))
- [u'A', u'""funky" style"', u'test.']
+ >>> list(smart_split(r"Another 'person\'s' test."))
+ [u'Another', u"'person's'", u'test.']
+ >>> list(smart_split(r'A "\"funky\" style" test.'))
+ [u'A', u'""funky" style"', u'test.']
"""
text = force_unicode(text)
for bit in smart_split_re.finditer(text):
Modified: django/trunk/tests/regressiontests/templates/tests.py
===================================================================
--- django/trunk/tests/regressiontests/templates/tests.py 2008-08-30
19:10:07 UTC (rev 8745)
+++ django/trunk/tests/regressiontests/templates/tests.py 2008-08-30
19:25:40 UTC (rev 8746)
@@ -720,10 +720,10 @@
'inheritance25': ("{% extends context_template.1 %}{% block first
%}2{% endblock %}{% block second %}4{% endblock %}", {'context_template':
[template.Template("Wrong"), template.Template("1{% block first %}_{% endblock
%}3{% block second %}_{% endblock %}")]}, '1234'),
# Set up a base template to extend
- 'inheritance26': ("no tags", {}, 'no tags'),
+ 'inheritance26': ("no tags", {}, 'no tags'),
- # Inheritance from a template that doesn't have any blocks
- 'inheritance27': ("{% extends 'inheritance26' %}", {}, 'no
tags'),
+ # Inheritance from a template that doesn't have any blocks
+ 'inheritance27': ("{% extends 'inheritance26' %}", {}, 'no tags'),
### I18N
##################################################################
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
