initial set of adjustments to make (most) imports work.

More to come, especially when it's about strings

8 files changed, 17 insertions, 19 deletions

diff --git a/git/test/lib/asserts.py b/git/test/lib/asserts.py
index 0f2fd99a..60a888b3 100644
--- a/git/test/lib/asserts.py
+++ b/git/test/lib/asserts.py
@@ -7,13 +7,6 @@
 import re
 import stat
 
-__all__ = ['assert_instance_of', 'assert_not_instance_of',
-           'assert_none', 'assert_not_none',
-           'assert_match', 'assert_not_match', 'assert_mode_644',
-           'assert_mode_755',
-           'assert_equal', 'assert_not_equal', 'assert_raises', 'patch', 'raises',
-           'assert_true', 'assert_false']
-
 from nose.tools import (
     assert_equal,
     assert_not_equal,
@@ -23,9 +16,14 @@ from nose.tools import (
     assert_false
 )
 
-from mock import (
-    patch
-)
+from mock import patch
+
+__all__ = ['assert_instance_of', 'assert_not_instance_of',
+           'assert_none', 'assert_not_none',
+           'assert_match', 'assert_not_match', 'assert_mode_644',
+           'assert_mode_755',
+           'assert_equal', 'assert_not_equal', 'assert_raises', 'patch', 'raises',
+           'assert_true', 'assert_false']
 
 
 def assert_instance_of(expected, actual, msg=None):
diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py
index 9c935ce0..0ea4fc7e 100644
--- a/git/test/lib/helper.py
+++ b/git/test/lib/helper.py
@@ -11,7 +11,7 @@ from unittest import TestCase
 import time
 import tempfile
 import shutil
-import cStringIO
+import io
 
 GIT_REPO = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
 
@@ -46,8 +46,8 @@ class StringProcessAdapter(object):
     Its tailored to work with the test system only"""
 
     def __init__(self, input_string):
-        self.stdout = cStringIO.StringIO(input_string)
-        self.stderr = cStringIO.StringIO()
+        self.stdout = io.StringIO(input_string)
+        self.stderr = io.StringIO()
 
     def wait(self):
         return 0
diff --git a/git/test/performance/test_commit.py b/git/test/performance/test_commit.py
index a890c833..fed6ef18 100644
--- a/git/test/performance/test_commit.py
+++ b/git/test/performance/test_commit.py
@@ -8,7 +8,7 @@ from .lib import TestBigRepoRW
 from git import Commit
 from gitdb import IStream
 from git.test.test_commit import assert_commit_serialization
-from cStringIO import StringIO
+from io import StringIO
 from time import time
 import sys
 
diff --git a/git/test/test_commit.py b/git/test/test_commit.py
index bfad6fd6..84f81f21 100644
--- a/git/test/test_commit.py
+++ b/git/test/test_commit.py
@@ -21,7 +21,7 @@ from git import (
 from gitdb import IStream
 from gitdb.util import hex_to_bin
 
-from cStringIO import StringIO
+from io import StringIO
 import time
 import sys
 import re
diff --git a/git/test/test_fun.py b/git/test/test_fun.py
index bf178aaa..4093065d 100644
--- a/git/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -24,7 +24,7 @@ from stat import (
 )
 
 from git.index import IndexFile
-from cStringIO import StringIO
+from io import StringIO
 
 
 class TestFun(TestBase):
diff --git a/git/test/test_index.py b/git/test/test_index.py
index 15fff8d4..74bdac53 100644
--- a/git/test/test_index.py
+++ b/git/test/test_index.py
@@ -30,7 +30,7 @@ from stat import (
     ST_MODE
 )
 
-from StringIO import StringIO
+from io import StringIO
 from gitdb.base import IStream
 from git.objects import Blob
 from git.index.typ import (
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index f6b46a6e..41c1c8f1 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -35,7 +35,7 @@ import os
 import sys
 import tempfile
 import shutil
-from cStringIO import StringIO
+from io import StringIO
 
 
 class TestRepo(TestBase):
diff --git a/git/test/test_tree.py b/git/test/test_tree.py
index d2e3606b..3b89abee 100644
--- a/git/test/test_tree.py
+++ b/git/test/test_tree.py
@@ -11,7 +11,7 @@ from git import (
     Blob
 )
 
-from cStringIO import StringIO
+from io import StringIO
 
 
 class TestTree(TestBase):