Fixed #8710: removed a few stray tabs. Thanks, gkelly.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
ddaa3016e2
commit
f2d7ee759a
|
@ -2,7 +2,7 @@
|
||||||
>>> from django.contrib.sites.models import Site
|
>>> from django.contrib.sites.models import Site
|
||||||
>>> from django.conf import settings
|
>>> from django.conf import settings
|
||||||
>>> Site(id=settings.SITE_ID, domain="example.com", name="example.com").save()
|
>>> Site(id=settings.SITE_ID, domain="example.com", name="example.com").save()
|
||||||
|
|
||||||
>>> # Make sure that get_current() does not return a deleted Site object.
|
>>> # Make sure that get_current() does not return a deleted Site object.
|
||||||
>>> s = Site.objects.get_current()
|
>>> s = Site.objects.get_current()
|
||||||
>>> isinstance(s, Site)
|
>>> isinstance(s, Site)
|
||||||
|
|
|
@ -207,10 +207,10 @@ def smart_split(text):
|
||||||
|
|
||||||
>>> list(smart_split(r'This is "a person\'s" test.'))
|
>>> list(smart_split(r'This is "a person\'s" test.'))
|
||||||
[u'This', u'is', u'"a person\\\'s"', u'test.']
|
[u'This', u'is', u'"a person\\\'s"', u'test.']
|
||||||
>>> list(smart_split(r"Another 'person\'s' test."))
|
>>> list(smart_split(r"Another 'person\'s' test."))
|
||||||
[u'Another', u"'person's'", u'test.']
|
[u'Another', u"'person's'", u'test.']
|
||||||
>>> list(smart_split(r'A "\"funky\" style" test.'))
|
>>> list(smart_split(r'A "\"funky\" style" test.'))
|
||||||
[u'A', u'""funky" style"', u'test.']
|
[u'A', u'""funky" style"', u'test.']
|
||||||
"""
|
"""
|
||||||
text = force_unicode(text)
|
text = force_unicode(text)
|
||||||
for bit in smart_split_re.finditer(text):
|
for bit in smart_split_re.finditer(text):
|
||||||
|
|
|
@ -720,10 +720,10 @@ class Templates(unittest.TestCase):
|
||||||
'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'),
|
'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
|
# 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
|
# Inheritance from a template that doesn't have any blocks
|
||||||
'inheritance27': ("{% extends 'inheritance26' %}", {}, 'no tags'),
|
'inheritance27': ("{% extends 'inheritance26' %}", {}, 'no tags'),
|
||||||
|
|
||||||
### I18N ##################################################################
|
### I18N ##################################################################
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue