Commit a4527728 by Chris Jerdonek

Removed the template_name parameter from View._get_template_name(), etc.

parent 64eb1056
...@@ -80,33 +80,31 @@ class View(object): ...@@ -80,33 +80,31 @@ class View(object):
return self.template_loader.load_template(template_name) return self.template_loader.load_template(template_name)
def get_template(self, template_name): def get_template(self):
""" """
Return the current template after setting it, if necessary. Return the current template after setting it, if necessary.
""" """
if not self.template: if not self.template:
template_name = self._get_template_name(template_name) template_name = self._get_template_name()
self.template = self.load_template(template_name) self.template = self.load_template(template_name)
return self.template return self.template
# TODO: consider removing the template_name parameter and using def _get_template_name(self):
# self.template_name instead.
def _get_template_name(self, template_name=None):
""" """
Return the name of this Template instance. Return the name of this Template instance.
If no template_name parameter is provided, this method returns the If the template_name attribute is not set, then this method constructs
class name modified as follows, for example: the template name from the class name as follows, for example:
TemplatePartial => template_partial TemplatePartial => template_partial
Otherwise, it returns the given template_name. Otherwise, this method returns the template_name.
""" """
if template_name: if self.template_name:
return template_name return self.template_name
template_name = self.__class__.__name__ template_name = self.__class__.__name__
...@@ -127,7 +125,7 @@ class View(object): ...@@ -127,7 +125,7 @@ class View(object):
Return the view rendered using the current context. Return the view rendered using the current context.
""" """
template = Template(self.get_template(self.template_name), self) template = Template(self.get_template(), self)
return template.render(encoding=encoding) return template.render(encoding=encoding)
def __contains__(self, needle): def __contains__(self, needle):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment