change codes with open func support encoding="utf-8"

git/refs/symbolic.py

@@ -1,5 +1,5 @@
 import os
-
+import codecs
 from git.compat import (
  string_types,
  defenc
@@ -76,7 +76,7 @@ def abspath(self):
  @classmethod
  def _get_packed_refs_path(cls, repo):
  try:
- commondir = open(osp.join(repo.git_dir, 'commondir'), 'rt', encoding="utf-8").readlines()[0].strip()
+ commondir = codecs.open(osp.join(repo.git_dir, 'commondir'), 'rt', encoding="utf-8").readlines()[0].strip()
  except (OSError, IOError):
  commondir = '.'
  repodir = osp.join(repo.git_dir, commondir)
@@ -87,7 +87,7 @@ def _iter_packed_refs(cls, repo):
  """Returns an iterator yielding pairs of sha1/path pairs (as bytes) for the corresponding refs.
  :note: The packed refs file will be kept open as long as we iterate"""
  try:
- with open(cls._get_packed_refs_path(repo), 'rt', encoding="utf-8") as fp:
+ with codecs.open(cls._get_packed_refs_path(repo), 'rt', encoding="utf-8") as fp:
  for line in fp:
  line = line.strip()
  if not line:
@@ -133,7 +133,7 @@ def _get_ref_info_helper(cls, repo, repodir, ref_path):
  point to, or None"""
  tokens = None
  try:
- with open(osp.join(repodir, ref_path), 'rt', encoding="utf-8") as fp:
+ with codecs.open(osp.join(repodir, ref_path), 'rt', encoding="utf-8") as fp:
  value = fp.read().rstrip()
  # Don't only split on spaces, but on whitespace, which allows to parse lines like
  # 60b64ef992065e2600bfef6187a97f92398a9144 branch 'master' of git-server:/path/to/repo
@@ -173,7 +173,7 @@ def _get_ref_info(cls, repo, ref_path):
  return cls._get_ref_info_helper(repo, repo.git_dir, ref_path)
  except ValueError:
  try:
- commondir = open(osp.join(repo.git_dir, 'commondir'), 'rt', encoding="utf-8").readlines()[0].strip()
+ commondir = codecs.open(osp.join(repo.git_dir, 'commondir'), 'rt', encoding="utf-8").readlines()[0].strip()
  except (OSError, IOError):
  commondir = '.'
 

git/repo/fun.py

@@ -1,21 +1,21 @@
 """Package with general repository related functions"""
+import codecs
 import os
+import os.path as osp
 import stat
 from string import digits
 
-from git.compat import xrange
-from git.exc import WorkTreeRepositoryUnsupported
-from git.objects import Object
-from git.refs import SymbolicReference
-from git.util import hex_to_bin, bin_to_hex, decygpath
 from gitdb.exc import (
  BadObject,
  BadName,
 )
 
-import os.path as osp
 from git.cmd import Git
-
+from git.compat import xrange
+from git.exc import WorkTreeRepositoryUnsupported
+from git.objects import Object
+from git.refs import SymbolicReference
+from git.util import hex_to_bin, bin_to_hex, decygpath
 
 __all__ = ('rev_parse', 'is_git_dir', 'touch', 'find_submodule_git_dir', 'name_to_object', 'short_to_long', 'deref_tag',
  'to_commit', 'find_worktree_git_dir')
@@ -58,7 +58,7 @@ def find_worktree_git_dir(dotgit):
  return None
 
  try:
- lines = open(dotgit, 'r', encoding="utf-8").readlines()
+ lines = codecs.open(dotgit, 'r', encoding="utf-8").readlines()
  for key, value in [line.strip().split(': ') for line in lines]:
  if key == 'gitdir':
  return value
@@ -73,7 +73,7 @@ def find_submodule_git_dir(d):
  return d
 
  try:
- with open(d, encoding="utf-8") as fp:
+ with codecs.open(d, encoding="utf-8") as fp:
  content = fp.read().rstrip()
  except (IOError, OSError):
  # it's probably not a file