Skip to content

Commit

Permalink
Fixed #8031 - url tag no longer silences NoReverseMatch exceptions si…
Browse files Browse the repository at this point in the history
…nce this is very rarely useful

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
spookylukey committed Aug 5, 2008
1 parent 8be1a43 commit c768bc6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
9 changes: 3 additions & 6 deletions django/template/defaulttags.py
Original file line number Diff line number Diff line change
Expand Up @@ -364,12 +364,9 @@ def render(self, context):
try:
return reverse(self.view_name, args=args, kwargs=kwargs)
except NoReverseMatch:
try:
project_name = settings.SETTINGS_MODULE.split('.')[0]
return reverse(project_name + '.' + self.view_name,
args=args, kwargs=kwargs)
except NoReverseMatch:
return ''
project_name = settings.SETTINGS_MODULE.split('.')[0]
return reverse(project_name + '.' + self.view_name,
args=args, kwargs=kwargs)

class WidthRatioNode(Node):
def __init__(self, val_expr, max_expr, max_width):
Expand Down
5 changes: 3 additions & 2 deletions tests/regressiontests/templates/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from datetime import datetime, timedelta

from django import template
from django.core import urlresolvers
from django.template import loader
from django.template.loaders import app_directories, filesystem
from django.utils.translation import activate, deactivate, ugettext as _
Expand Down Expand Up @@ -888,8 +889,8 @@ def get_template_tests(self):

# Failures
'url-fail01': ('{% url %}', {}, template.TemplateSyntaxError),
'url-fail02': ('{% url no_such_view %}', {}, ''),
'url-fail03': ('{% url regressiontests.templates.views.client no_such_param="value" %}', {}, ''),
'url-fail02': ('{% url no_such_view %}', {}, urlresolvers.NoReverseMatch),
'url-fail03': ('{% url regressiontests.templates.views.client %}', {}, urlresolvers.NoReverseMatch),

### CACHE TAG ######################################################
'cache01': ('{% load cache %}{% cache -1 test %}cache01{% endcache %}', {}, 'cache01'),
Expand Down

0 comments on commit c768bc6

Please sign in to comment.