Author: kmtracey Date: 2009-04-04 14:34:52 -0500 (Sat, 04 Apr 2009) New Revision: 10394
Modified: django/trunk/tests/regressiontests/templates/tests.py Log: Fixed the test added for #9005 to use the e.args[0] instead of e.message. 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. Modified: django/trunk/tests/regressiontests/templates/tests.py =================================================================== --- django/trunk/tests/regressiontests/templates/tests.py 2009-04-04 19:12:52 UTC (rev 10393) +++ django/trunk/tests/regressiontests/templates/tests.py 2009-04-04 19:34:52 UTC (rev 10394) @@ -154,24 +154,24 @@ 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 @@ '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'), --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-updates@googlegroups.com To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/django-updates?hl=en -~----------~----~----~----~------~----~------~--~---