diff options
author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-04-02 07:14:06 -0700 |
---|---|---|
committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-04-02 19:24:19 -0700 |
commit | b975e6aa1c68d37e812b0a723d4b6af919f42c61 (patch) | |
tree | e212d4669ba0b1485988a89a2ac40faf8d492912 | |
parent | 1db59132e095e3d5a7cf33175c9e96f82b4c9901 (diff) | |
download | pystache-b975e6aa1c68d37e812b0a723d4b6af919f42c61.tar.gz |
Eliminated another use of the ternary operator for Python 2.4 support.
-rw-r--r-- | pystache/spec_loader.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pystache/spec_loader.py b/pystache/spec_loader.py index ac706a5..3cb0f1a 100644 --- a/pystache/spec_loader.py +++ b/pystache/spec_loader.py @@ -36,12 +36,15 @@ class SpecLoader(object): """ if spec.template_rel_path is not None: return os.path.split(spec.template_rel_path) - # Otherwise, determine the file name separately. + locator = self.loader._make_locator() - template_name = (spec.template_name if spec.template_name is not None else - locator.make_template_name(spec)) + # We do not use the ternary operator for Python 2.4 support. + if spec.template_name is not None: + template_name = spec.template_name + else: + template_name = locator.make_template_name(spec) file_name = locator.make_file_name(template_name, spec.template_extension) |