From 82f0c8c317c1d51a45589b708e476e7711a21da4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 21 Aug 2009 04:46:31 +0000 Subject: Replace _content_encoding, _fs_encoding, and _merge_encoding with direct usage of _encodings. svn path=/main/trunk/; revision=14113 --- pym/portage/process.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pym/portage/process.py') diff --git a/pym/portage/process.py b/pym/portage/process.py index 1b5846883..1822a3082 100644 --- a/pym/portage/process.py +++ b/pym/portage/process.py @@ -10,7 +10,7 @@ import sys import traceback from portage import os -from portage import _content_encoding +from portage import _encodings from portage import _unicode_encode import portage portage.proxy.lazyimport.lazyimport(globals(), @@ -184,8 +184,8 @@ def spawn(mycommand, env={}, opt_name=None, fd_pipes=None, returnpid=False, # Avoid a potential UnicodeEncodeError from os.execve(). env_bytes = {} for k, v in env.iteritems(): - env_bytes[_unicode_encode(k, encoding=_content_encoding)] = \ - _unicode_encode(v, encoding=_content_encoding) + env_bytes[_unicode_encode(k, encoding=_encodings['content'])] = \ + _unicode_encode(v, encoding=_encodings['content']) env = env_bytes del env_bytes -- cgit v1.2.3-1-g7c22