Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed the test added for #9005 to use the e.args[0] instead of e.mess…

…age. Exceptions didn't have 'message' before Python 2.5, and it was deprecated as of Python 2.6. args[0] works without error or DeprecationWarning from Python 2.3 through 2.6.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 63143d5d9d4f0f4dc6a4948fca24d904e72f3d35 1 parent 48e01d2
Karen Tracey kmtracey authored
Showing with 9 additions and 9 deletions.
  1. +9 −9 tests/regressiontests/templates/tests.py
18 tests/regressiontests/templates/tests.py
View
@@ -154,24 +154,24 @@ def test_token_smart_split(self):
self.assertEqual(split, ["sometag", '_("Page not found")', 'value|yesno:_("yes,no")'])
def test_url_reverse_no_settings_module(self):
- #Regression test for #9005
+ # Regression test for #9005
from django.template import Template, Context, TemplateSyntaxError
-
+
old_settings_module = settings.SETTINGS_MODULE
old_template_debug = settings.TEMPLATE_DEBUG
-
+
settings.SETTINGS_MODULE = None
settings.TEMPLATE_DEBUG = True
-
+
t = Template('{% url will_not_match %}')
c = Context()
try:
rendered = t.render(c)
except TemplateSyntaxError, e:
- #Assert that we are getting the template syntax error and not the
- #string encoding error.
- self.assertEquals(e.message, "Caught an exception while rendering: Reverse for 'will_not_match' with arguments '()' and keyword arguments '{}' not found.")
-
+ # Assert that we are getting the template syntax error and not the
+ # string encoding error.
+ self.assertEquals(e.args[0], "Caught an exception while rendering: Reverse for 'will_not_match' with arguments '()' and keyword arguments '{}' not found.")
+
settings.SETTINGS_MODULE = old_settings_module
settings.TEMPLATE_DEBUG = old_template_debug
@@ -931,7 +931,7 @@ def get_template_tests(self):
'widthratio08': ('{% widthratio %}', {}, template.TemplateSyntaxError),
'widthratio09': ('{% widthratio a b %}', {'a':50,'b':100}, template.TemplateSyntaxError),
'widthratio10': ('{% widthratio a b 100.0 %}', {'a':50,'b':100}, '50'),
-
+
# #10043: widthratio should allow max_width to be a variable
'widthratio11': ('{% widthratio a b c %}', {'a':50,'b':100, 'c': 100}, '50'),
Please sign in to comment.
Something went wrong with that request. Please try again.