https://bitbucket.org/ianb/tempita/issue/6/tempita-cli-depends-on-paste

2 files changed, 13 insertions, 7 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',
diff --git a/tests/runtests.py b/tests/runtests.py
index 54266c0..92b7e12 100644..100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 import sys, os
 sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
 import doctest
@@ -5,4 +7,4 @@ import doctest
 if __name__ == '__main__':
     doctest.testfile('test_template.txt')
     doctest.testfile('../docs/index.txt')
-    
+