Assume utf_8 encoding in alls reads/writes (unicode handling required for py3k).

svn path=/main/trunk/; revision=13791

diff --git a/pym/portage/cache/flat_hash.py b/pym/portage/cache/flat_hash.py
index ac1b7f190e055d6a7b527199147ca9acd6feb543..71ddf6023afc0387139053166e00fdbbcc918d5c 100644 (file)
--- a/pym/portage/cache/flat_hash.py
+++ b/pym/portage/cache/flat_hash.py
@@ -3,6 +3,7 @@
 # License: GPL2
 # $Id$
 
+import codecs
 from portage.cache import fs_template
 from portage.cache import cache_errors
 import errno, os, stat
@@ -26,7 +27,7 @@ class database(fs_template.FsBased):
        def _getitem(self, cpv):
                fp = os.path.join(self.location, cpv)
                try:
-                       myf = open(fp, "r")
+                       myf = codecs.open(fp, mode='r', encoding='utf_8', errors='replace')
                        try:
                                d = self._parse_data(myf, cpv)
                                if '_mtime_' not in d:
@@ -54,12 +55,14 @@ class database(fs_template.FsBased):
                s = cpv.rfind("/")
                fp = os.path.join(self.location,cpv[:s],".update.%i.%s" % (os.getpid(), cpv[s+1:]))
                try:
-                       myf = open(fp, 'w')
+                       myf = codecs.open(fp, mode='w',
+                               encoding='utf_8', errors='replace')
                except (IOError, OSError), e:
                        if errno.ENOENT == e.errno:
                                try:
                                        self._ensure_dirs(cpv)
-                                       myf=open(fp,"w")
+                                       myf = codecs.open(fp, mode='w',
+                                               encoding='utf_8', errors='replace')
                                except (OSError, IOError),e:
                                        raise cache_errors.CacheCorruption(cpv, e)
                        else: