diff options
author | Jeff Hammel <jhammel@mozilla.com> | 2013-12-16 19:55:22 -0800 |
---|---|---|
committer | Jeff Hammel <jhammel@mozilla.com> | 2013-12-16 19:55:22 -0800 |
commit | 80da35b68de4f8fed0cf6585aafbc3d017ae42e0 (patch) | |
tree | ae2cd1334acd1f0db26cbe3ad1cbd82f97aa7cc8 /tempita | |
parent | 3c0b5ddb95c89ce800e67a510803f61eb8d6fa0c (diff) | |
download | tempita-80da35b68de4f8fed0cf6585aafbc3d017ae42e0.tar.gz |
https://bitbucket.org/ianb/tempita/issue/6/tempita-cli-depends-on-paste
Diffstat (limited to 'tempita')
-rw-r--r-- | tempita/__init__.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tempita/__init__.py b/tempita/__init__.py index 83528b3..0511b9a 100644 --- a/tempita/__init__.py +++ b/tempita/__init__.py @@ -107,7 +107,7 @@ class Template(object): self.default_namespace['start_braces'] = delimeters[0] self.default_namespace['end_braces'] = delimeters[1] self.delimeters = delimeters - + self._unicode = is_unicode(content) if name is None and stacklevel is not None: try: @@ -1118,14 +1118,18 @@ strings. def fill_command(args=None): import sys import optparse - import pkg_resources import os if args is None: args = sys.argv[1:] - dist = pkg_resources.get_distribution('Paste') - parser = optparse.OptionParser( - version=coerce_text(dist), - usage=_fill_command_usage) + kwargs = dict(usage=_fill_command_usage) + try: + import pkg_resources + dist = pkg_resources.get_distribution('tempita') + kwargs['version'] = coerce_text(dist) + except ImportError: + # pkg_resources not available + pass + parser = optparse.OptionParser(**kwargs) parser.add_option( '-o', '--output', dest='output', |