From 27c7ca00ae705e03fd664eb5adc379c6eef898d6 Mon Sep 17 00:00:00 2001 From: noah morrison Date: Sat, 22 Nov 2014 18:16:47 -0500 Subject: [PATCH] Fixed imports (please help) This is terrible... I hate it... there must be a better way... --- __init__.py | 5 +++-- chevron/main.py | 13 +++++++++++-- chevron/renderer.py | 12 +++++++++++- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/__init__.py b/__init__.py index 5ac41ff..6083388 100644 --- a/__init__.py +++ b/__init__.py @@ -1,3 +1,4 @@ -from .chevron import main, render, UnclosedSection, cli_main +from .chevron.main import main, cli_main +from .chevron.renderer import render -__all__ = ['main', 'render', 'UnclosedSection', 'cli_main'] +__all__ = ['main', 'render', 'cli_main'] diff --git a/chevron/main.py b/chevron/main.py index 3862334..7e57030 100755 --- a/chevron/main.py +++ b/chevron/main.py @@ -4,8 +4,17 @@ import json from sys import argv -from chevron.tokenizer import tokenize -from chevron.renderer import render +# +# Python 2 and 3, module and script compatability +# If you know a better way please tell me :( +# + +try: + from .tokenizer import tokenize + from .renderer import render +except (ValueError, SystemError): + from tokenizer import tokenize + from renderer import render def main(template, data={}, **kwargs): diff --git a/chevron/renderer.py b/chevron/renderer.py index f26b36d..2879625 100644 --- a/chevron/renderer.py +++ b/chevron/renderer.py @@ -1,6 +1,16 @@ #!/usr/bin/python -from chevron.tokenizer import tokenize + +# +# Python 2 and 3, module and script compatability +# If you know a better way please tell me :( +# + +try: + from .tokenizer import tokenize +except (ValueError, SystemError): + from tokenizer import tokenize + try: # python 2 unicode -- 2.47.3