summaryrefslogtreecommitdiff
path: root/git/repo/base.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-04 19:50:28 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-04 19:50:28 +0100
commitae2ff0f9d704dc776a1934f72a339da206a9fff4 (patch)
tree53b7cb30f47c60bdf38d824f1c729191d1f1f2d9 /git/repo/base.py
parentf6aa8d116eb33293c0a9d6d600eb7c32832758b9 (diff)
downloadgitpython-ae2ff0f9d704dc776a1934f72a339da206a9fff4.tar.gz
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.
Diffstat (limited to 'git/repo/base.py')
-rw-r--r--git/repo/base.py9
1 files changed, 5 insertions, 4 deletions
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