WIP

5 files changed, 18 insertions, 2 deletions

diff --git a/yq/__init__.py b/yq/__init__.py
index bf54265..1dbc99b 100755
--- a/yq/__init__.py
+++ b/yq/__init__.py
@@ -13,13 +13,12 @@ from datetime import datetime, date, time
 
 import yaml
 
+from .compat import USING_PYTHON2
 from .parser import get_parser, jq_arg_spec
 from .loader import get_loader
 from .dumper import get_dumper
 from .version import __version__  # noqa
 
-USING_PYTHON2 = True if sys.version_info < (3, 0) else False
-
 class JSONDateTimeEncoder(json.JSONEncoder):
     def default(self, o):
         if isinstance(o, (datetime, date, time)):
diff --git a/yq/compat.py b/yq/compat.py
new file mode 100644
index 0000000..5649909
--- /dev/null
+++ b/yq/compat.py
@@ -0,0 +1,10 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+import sys
+
+USING_PYTHON2 = True if sys.version_info < (3, 0) else False
+
+if USING_PYTHON2:
+    str = unicode  # noqa
+else:
+    str = str
diff --git a/yq/dumper.py b/yq/dumper.py
index 171c324..01c1713 100644
--- a/yq/dumper.py
+++ b/yq/dumper.py
@@ -1,8 +1,11 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
+
 import re
 from collections import OrderedDict
 
 import yaml
 
+from .compat import str
 from .loader import hash_key
 
 class OrderedIndentlessDumper(yaml.SafeDumper):
diff --git a/yq/loader.py b/yq/loader.py
index abda8c5..9397c36 100644
--- a/yq/loader.py
+++ b/yq/loader.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
+
 import yaml
 from base64 import b64encode
 from collections import OrderedDict
diff --git a/yq/parser.py b/yq/parser.py
index 56a8e68..765a35a 100644
--- a/yq/parser.py
+++ b/yq/parser.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function, unicode_literals
+
 import sys, argparse, subprocess
 
 from .version import __version__