diff --git a/commands.py b/commands.py
index 02090ad0..d4b5f5de 100644
--- a/commands.py
+++ b/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 *
diff --git a/git/__init__.py b/git/__init__.py
index a381808c..210deb29 100644
--- a/git/__init__.py
+++ b/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
diff --git a/git/add.py b/git/add.py
index 5619082c..502ec61c 100644
--- a/git/add.py
+++ b/git/add.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import os
 import re
 
diff --git a/git/annotate.py b/git/annotate.py
index 2cf147ac..686fc432 100644
--- a/git/annotate.py
+++ b/git/annotate.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import tempfile
 import re
 import os
diff --git a/git/commit.py b/git/commit.py
index f8dbc504..7fc57266 100644
--- a/git/commit.py
+++ b/git/commit.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import functools
 import tempfile
 import os
diff --git a/git/core.py b/git/core.py
index 34dcde9a..f25354f3 100644
--- a/git/core.py
+++ b/git/core.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import os
 import sublime
 import sublime_plugin
diff --git a/git/diff.py b/git/diff.py
index 11a4c3ca..5abdc390 100644
--- a/git/diff.py
+++ b/git/diff.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import sublime
 import sublime_plugin
 import os
diff --git a/git/flow.py b/git/flow.py
index 51317663..68a4115a 100644
--- a/git/flow.py
+++ b/git/flow.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import sublime
 from . import GitWindowCommand
 
diff --git a/git/history.py b/git/history.py
index c1c5e163..83e9acd5 100644
--- a/git/history.py
+++ b/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
 
 
diff --git a/git/repo.py b/git/repo.py
index bf1b277e..9b1e5f6a 100644
--- a/git/repo.py
+++ b/git/repo.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import os
 
 import sublime
diff --git a/git/stash.py b/git/stash.py
index a4cf215e..c46e8af5 100644
--- a/git/stash.py
+++ b/git/stash.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 from . import GitWindowCommand
 
 
diff --git a/git/status.py b/git/status.py
index fdec545b..e0a010f7 100644
--- a/git/status.py
+++ b/git/status.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import os
 import re
 
diff --git a/git/statusbar.py b/git/statusbar.py
index 520666c4..d5b9f26d 100644
--- a/git/statusbar.py
+++ b/git/statusbar.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, unicode_literals, print_function, division
+
 import re
 
 import sublime