diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-06-17 10:25:48 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-06-17 10:25:48 +0000 |
| commit | 2126d41aba06b50a288cc6a516d4531ced998822 (patch) | |
| tree | 2ed0e56153471e6076903c99fda834a5f78dd364 /django/template/loader.py | |
| parent | 1bfcfe615c65565da5009a205aecff394217717c (diff) | |
unicode: Render templates as unicode objects and only convert them to
bytestrings as part of HttpRespnose and other output paths.
git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/template/loader.py')
| -rw-r--r-- | django/template/loader.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/template/loader.py b/django/template/loader.py index d142e8951e..03e6f8d49d 100644 --- a/django/template/loader.py +++ b/django/template/loader.py @@ -87,7 +87,7 @@ def get_template_from_string(source, origin=None, name=None): """ return Template(source, origin, name) -def render_to_string(template_name, dictionary=None, context_instance=None, encoding=None): +def render_to_string(template_name, dictionary=None, context_instance=None): """ Loads the given template_name and renders it with the given dictionary as context. The template_name may be a string to load a single template using @@ -103,7 +103,7 @@ def render_to_string(template_name, dictionary=None, context_instance=None, enco context_instance.update(dictionary) else: context_instance = Context(dictionary) - return t.render(context_instance, encoding) + return t.render(context_instance) def select_template(template_name_list): "Given a list of template names, returns the first that can be loaded." |