Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #9005: don't wig out when reversing a URL if SETTINGS_MODULE is…

…n't set. While I was there, I fixed #10599 by re-raising the original error message, which is almost always a better idea. Thanks, Eric

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 624caace17dbb9e22f5a4c6c08937d68cbdbb066 1 parent dc832d7
@jacobian jacobian authored
View
2  django/core/management/__init__.py
@@ -323,7 +323,7 @@ def setup_environ(settings_mod, original_settings_path=None):
else:
os.environ['DJANGO_SETTINGS_MODULE'] = '%s.%s' % (project_name, settings_name)
- # Import the project module. We add the parent directory to PYTHONPATH to
+ # Import the project module. We add the parent directory to PYTHONPATH to
# avoid some of the path errors new users can have.
sys.path.append(os.path.join(project_directory, os.pardir))
project_module = import_module(project_name)
View
19 django/template/defaulttags.py
@@ -370,14 +370,21 @@ def render(self, context):
url = ''
try:
url = reverse(self.view_name, args=args, kwargs=kwargs)
- except NoReverseMatch:
- project_name = settings.SETTINGS_MODULE.split('.')[0]
- try:
- url = reverse(project_name + '.' + self.view_name,
+ except NoReverseMatch, e:
+ if settings.SETTINGS_MODULE:
+ project_name = settings.SETTINGS_MODULE.split('.')[0]
+ try:
+ url = reverse(project_name + '.' + self.view_name,
args=args, kwargs=kwargs)
- except NoReverseMatch:
+ except NoReverseMatch:
+ if self.asvar is None:
+ # Re-raise the original exception, not the one with
+ # the path relative to the project. This makes a
+ # better error message.
+ raise e
+ else:
if self.asvar is None:
- raise
+ raise e
if self.asvar:
context[self.asvar] = url
View
15 tests/regressiontests/templates/tests.py
@@ -153,6 +153,21 @@ def test_token_smart_split(self):
split = token.split_contents()
self.assertEqual(split, ["sometag", '_("Page not found")', 'value|yesno:_("yes,no")'])
+ def test_url_reverse_no_settings_module(self):
+ #Regression test for #9005
+ from django.template import Template, Context, TemplateSyntaxError
+ old_settings_module = settings.SETTINGS_MODULE
+ settings.SETTINGS_MODULE = None
+ 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.")
+ settings.SETTINGS_MODULE = old_settings_module
+
def test_templates(self):
template_tests = self.get_template_tests()
filter_tests = filters.get_filter_tests()
Please sign in to comment.
Something went wrong with that request. Please try again.