From ae2ff0f9d704dc776a1934f72a339da206a9fff4 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Sun, 4 Jan 2015 19:50:28 +0100
Subject: Dum brute force conversion of all types.

However, StringIO really is ByteIO in most cases, and py2.7 should
run but doesn't.
This should be made work first.
---
 git/repo/base.py | 9 +++++----
 git/repo/fun.py  | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'git/repo')

diff --git a/git/repo/base.py b/git/repo/base.py
index e5ae7623..f92a85ce 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -47,6 +47,7 @@ from .fun import (
     read_gitfile,
     touch,
 )
+from git.compat import text_type
 
 import os
 import sys
@@ -176,11 +177,11 @@ class Repo(object):
     # Description property
     def _get_description(self):
         filename = join(self.git_dir, 'description')
-        return file(filename).read().rstrip()
+        return open(filename).read().rstrip()
 
     def _set_description(self, descr):
         filename = join(self.git_dir, 'description')
-        file(filename, 'w').write(descr + '\n')
+        open(filename, 'w').write(descr + '\n')
 
     description = property(_get_description, _set_description,
                            doc="the project's description")
@@ -389,7 +390,7 @@ class Repo(object):
         if rev is None:
             return self.head.commit
         else:
-            return self.rev_parse(unicode(rev) + "^0")
+            return self.rev_parse(text_type(rev) + "^0")
 
     def iter_trees(self, *args, **kwargs):
         """:return: Iterator yielding Tree objects
@@ -412,7 +413,7 @@ class Repo(object):
         if rev is None:
             return self.head.commit.tree
         else:
-            return self.rev_parse(unicode(rev) + "^{tree}")
+            return self.rev_parse(text_type(rev) + "^{tree}")
 
     def iter_commits(self, rev=None, paths='', **kwargs):
         """A list of Commit objects representing the history of a given ref/commit
diff --git a/git/repo/fun.py b/git/repo/fun.py
index d08e5fed..64b9b4a9 100644
--- a/git/repo/fun.py
+++ b/git/repo/fun.py
@@ -13,6 +13,7 @@ from gitdb.util import (
     hex_to_bin,
     bin_to_hex
 )
+from git.compat import xrange
 
 
 __all__ = ('rev_parse', 'is_git_dir', 'touch', 'read_gitfile', 'find_git_dir', 'name_to_object',
-- 
cgit v1.2.3