diff --git a/django/contrib/sites/tests.py b/django/contrib/sites/tests.py index f39f7a2c82f..b607f021d5d 100644 --- a/django/contrib/sites/tests.py +++ b/django/contrib/sites/tests.py @@ -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) diff --git a/django/utils/text.py b/django/utils/text.py index 3686a454a8c..1548cfa77ed 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -207,10 +207,10 @@ def smart_split(text): >>> 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): diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py index f04bf0c33da..187eb43cf48 100644 --- a/tests/regressiontests/templates/tests.py +++ b/tests/regressiontests/templates/tests.py @@ -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'), # 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 ##################################################################