raise portage.exception.PermissionDenied(mypath)
ftype = []
for x in list:
- if not isinstance(x, unicode):
- x = unicode(x, encoding='utf_8', errors='replace')
try:
if followSymlinks:
pathstat = os.stat(mypath+"/"+x)
env = os.environ
# Avoid potential UnicodeDecodeError exceptions later.
- env_unicode = {}
- for k, v in env.iteritems():
- if not isinstance(k, unicode):
- k = unicode(k, encoding='utf_8', errors='replace')
- if not isinstance(v, unicode):
- v = unicode(v, encoding='utf_8', errors='replace')
- env_unicode[k] = v
+ env_unicode = dict((_unicode_decode(k), _unicode_decode(v))
+ for k, v in env.iteritems())
self.backupenv = env_unicode
raise ValueError("Invalid type being used as a value: '%s': '%s'" % (str(mykey),str(myvalue)))
# Avoid potential UnicodeDecodeError exceptions later.
- if not isinstance(mykey, unicode):
- mykey = unicode(mykey, encoding='utf_8', errors='replace')
- if not isinstance(myvalue, unicode):
- myvalue = unicode(myvalue, encoding='utf_8', errors='replace')
+ mykey = _unicode_decode(mykey)
+ myvalue = _unicode_decode(myvalue)
self.modifying()
self.modifiedkeys.append(mykey)
""" epatch will just grab all the patches out of a directory, so we have to
make sure there aren't any foreign files that it might grab."""
filesdir = os.path.join(pkgdir, "files")
- if isinstance(filesdir, unicode):
- # Avoid UnicodeDecodeError raised from
- # os.path.join when called by os.walk.
- filesdir = filesdir.encode('utf_8', 'replace')
for parent, dirs, files in os.walk(filesdir):
+ parent = _unicode_decode(parent)
for d in dirs:
if d.startswith(".") or d == "CVS":
dirs.remove(d)
for f in files:
+ f = _unicode_decode(f)
if f.startswith("."):
continue
f = os.path.join(parent, f)[len(filesdir) + 1:]
(_shell_quote(mysettings["D"]),))
destdir = mysettings["D"]
- if isinstance(destdir, unicode):
- # Avoid UnicodeDecodeError raised from
- # os.path.join when called by os.walk.
- destdir = destdir.encode('utf_8', 'replace')
size = 0
counted_inodes = set()
for parent, dirs, files in os.walk(destdir):
+ parent = _unicode_decode(parent)
for fname in chain(dirs, files):
+ fname = _unicode_decode(fname)
fpath = os.path.join(parent, fname)
mystat = os.lstat(fpath)
if stat.S_ISREG(mystat.st_mode) and \
if not mybytes[-1]:
break
os.close(pr)
- mybytes = u''.join(unicode(chunk,
- encoding='utf_8', errors='replace') for chunk in mybytes)
global auxdbkeys
for k, v in izip(auxdbkeys, mybytes.splitlines()):
dbkey[k] = v
from portage import listdir, dep_expand, digraph, flatten, key_expand, \
doebuild_environment, doebuild, env_update, prepare_build_dirs, \
- abssymlink, movefile, _movefile, bsd_chflags, cpv_getkey, \
- _unicode_module_wrapper
+ abssymlink, movefile, _movefile, bsd_chflags, cpv_getkey
+
+# This is a special version of the os module, wrapped for unicode support.
+from portage import os
from portage.cache.mappings import slot_dict_class
import sys
from itertools import izip
-os = portage.os
-
try:
import cPickle as pickle
except ImportError:
raise CommandNotFound(args[0])
else:
for l in proc.stdout:
- if not isinstance(l, unicode):
- l = unicode(l, encoding='utf_8', errors='replace')
+ l = portage._unicode_decode(l)
l = l[3:].rstrip("\n")
if not l:
continue
now has a categories property that is generated from the
available packages.
"""
- self.root = root[:]
+ self.root = portage._unicode_decode(root)
#cache for category directory mtimes
self.mtdircache = {}
returnme = []
for x in dir_list:
- if not isinstance(x, unicode):
- x = unicode(x, encoding='utf_8', errors='replace')
if self._excluded_dirs.match(x) is not None:
continue
ps = pkgsplit(x)
else:
def listdir(p, **kwargs):
try:
- return [isinstance(x, unicode) and x or \
- unicode(x, encoding='utf_8', errors='replace') \
- for x in os.listdir(p) \
+ return [x for x in os.listdir(p) \
if os.path.isdir(os.path.join(p, x))]
except EnvironmentError, e:
if e.errno == PermissionDenied.errno:
cache_mtime, metadata = pkg_data
cache_valid = cache_mtime == mydir_mtime
if cache_valid:
+ # Migrate old metadata to unicode.
for k, v in metadata.iteritems():
- if not isinstance(v, unicode):
- # Migrate old metadata to unicode.
- metadata[k] = unicode(v,
- encoding='utf_8', errors='replace')
+ metadata[k] = portage._unicode_decode(v)
mydata.update(metadata)
pull_me.difference_update(mydata)
if not hasattr(pkg, "getcontents"):
pkg = self._dblink(pkg)
root = self.root
- if not isinstance(root, unicode):
- root = unicode(root, encoding='utf_8', errors='replace')
root_len = len(root) - 1
new_contents = pkg.getcontents().copy()
removed = 0
for filename in paths:
- if not isinstance(filename, unicode):
- filename = unicode(filename,
- encoding='utf_8', errors='replace')
+ filename = portage._unicode_decode(filename)
filename = normalize_path(filename)
if relative_paths:
relative_filename = filename
h = self._new_hash()
# Always use a constant utf_8 encoding here, since
# the "default" encoding can change.
- h.update(s.encode('utf_8', 'replace'))
+ h.update(portage._unicode_encode(s))
h = h.hexdigest()
h = h[-self._hex_chars:]
h = int(h, 16)
if the file is not owned by this package.
"""
- if not isinstance(filename, unicode):
- filename = unicode(filename,
- encoding='utf_8', errors='replace')
+ filename = portage._unicode_decode(filename)
- if not isinstance(destroot, unicode):
- destroot = unicode(destroot,
- encoding='utf_8', errors='replace')
+ destroot = portage._unicode_decode(destroot)
destfile = normalize_path(
os.path.join(destroot, filename.lstrip(os.path.sep)))
new_contents = self.getcontents().copy()
old_contents = self._installed_instance.getcontents()
for f in sorted(preserve_paths):
- if not isinstance(f, unicode):
- f = unicode(f, encoding='utf_8', errors='replace')
+ f = portage._unicode_decode(f)
f_abs = os.path.join(root, f.lstrip(os.sep))
contents_entry = old_contents.get(f_abs)
if contents_entry is None:
not existing; we will merge these symlinks at a later time.
"""
+ srcroot = portage._unicode_decode(srcroot)
+ destroot = portage._unicode_decode(destroot)
+ inforoot = portage._unicode_decode(inforoot)
+ myebuild = portage._unicode_decode(myebuild)
+
showMessage = self._display_merge
scheduler = self._scheduler
myfilelist = []
mylinklist = []
paths_with_newlines = []
-
- if isinstance(srcroot, unicode):
- # Avoid UnicodeDecodeError raised from
- # os.path.join when called by os.walk.
- srcroot = srcroot.encode('utf_8', 'replace')
-
srcroot_len = len(srcroot)
def onerror(e):
raise
for parent, dirs, files in os.walk(srcroot, onerror=onerror):
+ parent = portage._unicode_decode(parent)
for f in files:
+ f = portage._unicode_decode(f)
file_path = os.path.join(parent, f)
relative_path = file_path[srcroot_len:]
writemsg = self._display_merge
scheduler = self._scheduler
- from os.path import sep, join
+ sep = portage.os.sep
+ join = portage.os.path.join
srcroot = normalize_path(srcroot).rstrip(sep) + sep
destroot = normalize_path(destroot).rstrip(sep) + sep
mydest = join(destroot, offset, x)
# myrealdest is mydest without the $ROOT prefix (makes a difference if ROOT!="/")
myrealdest = join(sep, offset, x)
- if not isinstance(myrealdest, unicode):
- myrealdest = unicode(myrealdest,
- encoding='utf_8', errors='replace')
# stat file once, test using S_* macros many times (faster that way)
mystat = os.lstat(mysrc)
mymode = mystat[stat.ST_MODE]
projects / portage.git / commitdiff