Fixed imports (please help)

This is terrible... I hate it... there must be a better way...

diff --git a/__init__.py b/__init__.py
index 5ac41ff239355d7bbee6d65851088811a617cbab..608338865ba0749424b2a9a942562ca8d2543a94 100644 (file)
--- 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 38623344a9783ceedcd01dd3a20bcf06e4a162f3..7e57030a8f64104b1dfac24dc968e4713da3628e 100755 (executable)
--- 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 f26b36d54eb37c433935e207581008527d4cee4e..2879625b1dc4f099ec1eb46bad19d545ea17fec6 100644 (file)
--- 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