from portage.versions import catsplit
from portage import cpv_getkey
from portage import os
+from portage import _fs_encoding
from portage import _unicode_decode
import xattr
from errno import ENODATA,ENOSPC,E2BIG
for root, dirs, files in os.walk(self.portdir):
for file in files:
- file = _unicode_decode(file)
+ try:
+ file = _unicode_decode(file,
+ encoding=_fs_encoding, errors='strict')
+ except UnicodeDecodeError:
+ continue
if file[-7:] == '.ebuild':
cat = os.path.basename(os.path.dirname(root))
pn_pv = file[:-7]
# $Id$
import codecs
-import os
+import errno
import stat
+from portage import os
+from portage import _content_encoding
+from portage import _fs_encoding
+from portage import _unicode_decode
+from portage import _unicode_encode
from portage.localization import _
class LoaderError(Exception):
@returns: List of files to process
"""
- if isinstance(filename, unicode):
- # Avoid UnicodeDecodeError raised from
- # os.path.join when called by os.walk.
- filename = filename.encode('utf_8', 'replace')
-
try:
st = os.stat(filename)
except OSError:
if d[:1] == '.' or d == 'CVS':
dirs.remove(d)
for f in files:
+ try:
+ f = _unicode_decode(f,
+ encoding=_fs_encoding, errors='strict')
+ except UnicodeDecodeError:
+ continue
if f[:1] == '.' or f[-1:] == '~':
continue
yield os.path.join(root, f)
# once, which may be expensive due to digging in child classes.
func = self.lineParser
for fn in RecursiveFileLoader(self.fname):
- f = codecs.open(fn, mode='r', encoding='utf_8', errors='replace')
+ try:
+ f = codecs.open(_unicode_encode(fn,
+ encoding=_fs_encoding, errors='strict'), mode='r',
+ encoding=_content_encoding, errors='replace')
+ except EnvironmentError, e:
+ if e.errno not in (errno.ENOENT, errno.ESTALE):
+ raise
+ del e
+ continue
for line_num, line in enumerate(f):
func(line, line_num, data, errors)
+ f.close()
return (data, errors)
def lineParser(self, line, line_num, data, errors):
# Distributed under the terms of the GNU General Public License v2
# $Id$
-import os
import sys
import time
import unittest
+from portage import os
+from portage import _fs_encoding
+from portage import _unicode_encode
+from portage import _unicode_decode
+
def main():
- TEST_FILE = '__test__'
+ TEST_FILE = _unicode_encode('__test__',
+ encoding=_fs_encoding, errors='strict')
+ svn_dirname = _unicode_encode('.svn',
+ encoding=_fs_encoding, errors='strict')
suite = unittest.TestSuite()
basedir = os.path.dirname(os.path.realpath(__file__))
testDirs = []
# I was tired of adding dirs to the list, so now we add __test__
# to each dir we want tested.
for root, dirs, files in os.walk(basedir):
- if ".svn" in dirs:
- dirs.remove('.svn')
+ if svn_dirname in dirs:
+ dirs.remove(svn_dirname)
+ try:
+ root = _unicode_decode(root,
+ encoding=_fs_encoding, errors='strict')
+ except UnicodeDecodeError:
+ continue
+
if TEST_FILE in files:
testDirs.append(root)
# Distributed under the terms of the GNU General Public License v2
# $Id$
-import errno, os, re, sys
-
+import codecs
+import errno
+import re
+import sys
+
+from portage import os
+from portage import _content_encoding
+from portage import _fs_encoding
+from portage import _unicode_decode
+from portage import _unicode_encode
import portage
portage.proxy.lazyimport.lazyimport(globals(),
'portage.dep:dep_getkey,get_operator,isvalidatom,isjustname,remove_slot',
'portage.versions:ververify'
)
-from portage.const import USER_CONFIG_PATH, WORLD_FILE
+from portage.const import USER_CONFIG_PATH
from portage.exception import DirectoryNotFound, PortageException
from portage.localization import _
mydata = {}
for myfile in [f for f in os.listdir(dbdir) if f not in ignored_dbentries]:
file_path = os.path.join(dbdir, myfile)
- f = open(file_path, "r")
- mydata[myfile] = f.read()
- f.close()
+ mydata[myfile] = codecs.open(_unicode_encode(file_path,
+ encoding=_fs_encoding, errors='strict'),
+ mode='r', encoding=_content_encoding,
+ errors='replace').read()
updated_items = update_dbentries(update_iter, mydata)
for myfile, mycontent in updated_items.iteritems():
file_path = os.path.join(dbdir, myfile)
mystat = os.stat(file_path)
if file_path not in prev_mtimes or \
long(prev_mtimes[file_path]) != long(mystat.st_mtime):
- f = open(file_path)
- content = f.read()
- f.close()
+ content = codecs.open(_unicode_encode(file_path,
+ encoding=_fs_encoding, errors='strict'),
+ mode='r', encoding=_content_encoding, errors='replace').read()
update_data.append((file_path, mystat, content))
return update_data
return myupd, errors
def update_config_files(config_root, protect, protect_mask, update_iter):
- """Perform global updates on /etc/portage/package.* and the world file.
+ """Perform global updates on /etc/portage/package.*.
config_root - location of files to update
protect - list of paths from CONFIG_PROTECT
protect_mask - list of paths from CONFIG_PROTECT_MASK
update_iter - list of update commands as returned from parse_updates()"""
- if isinstance(config_root, unicode):
- # Avoid UnicodeDecodeError raised from
- # os.path.join when called by os.walk.
- config_root = config_root.encode('utf_8', 'replace')
-
config_root = normalize_path(config_root)
update_files = {}
file_contents = {}
if os.path.isdir(config_file):
for parent, dirs, files in os.walk(config_file):
for y in dirs:
+ try:
+ y = _unicode_decode(y,
+ encoding=_fs_encoding, errors='strict')
+ except UnicodeDecodeError:
+ dirs.remove(y)
+ continue
if y.startswith("."):
dirs.remove(y)
for y in files:
+ try:
+ y = _unicode_decode(y,
+ encoding=_fs_encoding, errors='strict')
+ except UnicodeDecodeError:
+ continue
if y.startswith("."):
continue
recursivefiles.append(
myxfiles = recursivefiles
for x in myxfiles:
try:
- myfile = open(os.path.join(abs_user_config, x),"r")
- file_contents[x] = myfile.readlines()
- myfile.close()
+ file_contents[x] = codecs.open(
+ _unicode_encode(os.path.join(abs_user_config, x),
+ encoding=_fs_encoding, errors='strict'),
+ mode='r', encoding=_content_encoding,
+ errors='replace').readlines()
except IOError:
if file_contents.has_key(x):
del file_contents[x]
import commands
import codecs
-import os
import errno
import logging
import shlex
import portage
from portage import os
-from portage import _merge_encoding
+from portage import _content_encoding
+from portage import _fs_encoding
from portage import _os_merge
from portage import _unicode_encode
from portage import _unicode_decode
os.path.join(myfilename, f), recursive))
else:
try:
- myfile = codecs.open(_unicode_encode(myfilename),
- mode='r', encoding='utf_8', errors='replace')
+ myfile = codecs.open(_unicode_encode(myfilename,
+ encoding=_fs_encoding, errors='strict'),
+ mode='r', encoding=_content_encoding, errors='replace')
mylines = myfile.readlines()
myfile.close()
except IOError, e:
# NOTE: shex doesn't seem to support unicode objects
# (produces spurious \0 characters with python-2.6.2)
if sys.hexversion < 0x3000000:
- content = open(_unicode_encode(mycfg), 'rb').read()
+ content = open(_unicode_encode(mycfg,
+ encoding=_fs_encoding, errors='strict'), 'rb').read()
else:
- content = open(_unicode_encode(mycfg), mode='r',
- encoding='utf_8', errors='replace').read()
+ content = open(_unicode_encode(mycfg,
+ encoding=_fs_encoding, errors='strict'), mode='r',
+ encoding=_content_encoding, errors='replace').read()
if content and content[-1] != '\n':
content += '\n'
except IOError, e:
return default
data = None
try:
- myf = open(_unicode_encode(filename), 'rb')
+ myf = open(_unicode_encode(filename,
+ encoding=_fs_encoding, errors='strict'), 'rb')
mypickle = pickle.Unpickler(myf)
data = mypickle.load()
myf.close()
open_func = open
else:
open_func = codecs.open
- kargs.setdefault('encoding', 'utf_8')
+ kargs.setdefault('encoding', _content_encoding)
kargs.setdefault('errors', 'replace')
if follow_links:
tmp_name = "%s.%i" % (canonical_path, os.getpid())
try:
object.__setattr__(self, '_file',
- open_func(_unicode_encode(tmp_name), mode=mode, **kargs))
+ open_func(_unicode_encode(tmp_name,
+ encoding=_fs_encoding, errors='strict'),
+ mode=mode, **kargs))
return
except IOError, e:
if canonical_path == filename:
object.__setattr__(self, '_real_name', filename)
tmp_name = "%s.%i" % (filename, os.getpid())
object.__setattr__(self, '_file',
- open_func(_unicode_encode(tmp_name), mode=mode, **kargs))
+ open_func(_unicode_encode(tmp_name,
+ encoding=_fs_encoding, errors='strict'),
+ mode=mode, **kargs))
def _get_target(self):
return object.__getattribute__(self, '_file')
projects / portage.git / commitdiff