[meld] vc.git: Don't do display-side decoding in version control backends
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] vc.git: Don't do display-side decoding in version control backends
- Date: Sun, 21 Jun 2015 00:01:38 +0000 (UTC)
commit 0a58fa97da7ad6de6a768e826b41c70a27cbc8a9
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Jun 21 08:14:59 2015 +1000
vc.git: Don't do display-side decoding in version control backends
meld/vc/git.py | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 23f982e..23bc5cd 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -66,8 +66,6 @@ class Vc(_vc.CachedVc):
"U": _vc.STATE_CONFLICT, # Unmerged
}
- file_encoding = sys.getfilesystemencoding()
-
def __init__(self, location):
super(Vc, self).__init__(location)
self._tree_cache = {}
@@ -338,7 +336,6 @@ class Vc(_vc.CachedVc):
# returned by git as quoted strings
if name[0] == '"':
name = name[1:-1].decode('string_escape')
- name = name.decode(self.file_encoding)
return os.path.abspath(
os.path.join(self.location, name))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]