Better future and imports

commands.py

@@ -1,17 +1,35 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 """This module collates the Git commands from the submodule
 
 ...it's a python 2 / 3 compatibility workaround, mostly.
 """
 
-from git.core import *
+try:
+    # Python 3
+    from .git.core import *
+
+    from .git.add import *
+    from .git.annotate import *
+    from .git.commit import *
+    from .git.diff import *
+    from .git.flow import *
+    from .git.history import *
+    from .git.repo import *
+    from .git.stash import *
+    from .git.status import *
+    from .git.statusbar import *
+except (ImportError, ValueError):
+    # Python 2
+    from git.core import *
 
-from git.add import *
-from git.annotate import *
-from git.commit import *
-from git.diff import *
-from git.flow import *
-from git.history import *
-from git.repo import *
-from git.stash import *
-from git.status import *
-from git.statusbar import *
+    from git.add import *
+    from git.annotate import *
+    from git.commit import *
+    from git.diff import *
+    from git.flow import *
+    from git.history import *
+    from git.repo import *
+    from git.stash import *
+    from git.status import *
+    from git.statusbar import *

git/__init__.py

@@ -1,5 +1,4 @@
-from __future__ import print_function
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals, print_function, division
 
 import os
 import sublime

git/add.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import os
 import re
 

git/annotate.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import tempfile
 import re
 import os

git/commit.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import functools
 import tempfile
 import os

git/core.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import os
 import sublime
 import sublime_plugin

git/diff.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import sublime
 import sublime_plugin
 import os

git/flow.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import sublime
 from . import GitWindowCommand
 

git/history.py

@@ -1,8 +1,10 @@
-import sublime_plugin
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import functools
 import re
 
 import sublime
+import sublime_plugin
 from . import GitTextCommand, GitWindowCommand, plugin_file
 
 

git/repo.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import os
 
 import sublime

git/stash.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 from . import GitWindowCommand
 
 

git/status.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import os
 import re
 

git/statusbar.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import re
 
 import sublime