From 47dbbb99e37438493e4ae7a7e7cee263bb30b82d Mon Sep 17 00:00:00 2001 From: Piotr Roszatycki Date: Mon, 26 Aug 2019 11:42:31 +0200 Subject: [PATCH 1/3] Allow to run as a single file script --- jinja2cli/cli.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) mode change 100644 => 100755 jinja2cli/cli.py diff --git a/jinja2cli/cli.py b/jinja2cli/cli.py old mode 100644 new mode 100755 index 79d84db..fd4d9aa --- a/jinja2cli/cli.py +++ b/jinja2cli/cli.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 + """ jinja2-cli ========== @@ -354,9 +356,11 @@ def __init__(self, **kwargs): def get_version(self): from jinja2 import __version__ as jinja_version - from jinja2cli import __version__ - - return "jinja2-cli v%s\n - Jinja2 v%s" % (__version__, jinja_version) + try: + from jinja2cli import __version__ + return "jinja2-cli v%s\n - Jinja2 v%s" % (__version__, jinja_version) + except ModuleNotFoundError: + return "jinja2-cli\n - Jinja2 v%s" % (jinja_version) def main(): From a5a02be51e75b6b648d927bea8e1f558d85f650e Mon Sep 17 00:00:00 2001 From: Piotr Roszatycki Date: Mon, 26 Aug 2019 11:50:15 +0200 Subject: [PATCH 2/3] ImportError for older Python --- jinja2cli/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jinja2cli/cli.py b/jinja2cli/cli.py index fd4d9aa..b2f0bdb 100755 --- a/jinja2cli/cli.py +++ b/jinja2cli/cli.py @@ -359,7 +359,7 @@ def get_version(self): try: from jinja2cli import __version__ return "jinja2-cli v%s\n - Jinja2 v%s" % (__version__, jinja_version) - except ModuleNotFoundError: + except ImportError: return "jinja2-cli\n - Jinja2 v%s" % (jinja_version) From 0404e434149fceb128b9524f00bb8b6c40b0db8d Mon Sep 17 00:00:00 2001 From: Piotr Roszatycki Date: Mon, 26 Aug 2019 11:50:47 +0200 Subject: [PATCH 3/3] shebang with python, not python3 --- jinja2cli/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jinja2cli/cli.py b/jinja2cli/cli.py index b2f0bdb..510d3b2 100755 --- a/jinja2cli/cli.py +++ b/jinja2cli/cli.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python """ jinja2-cli