From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7E74E138821 for ; Wed, 1 Apr 2015 22:28:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8170CE0B62; Wed, 1 Apr 2015 22:28:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15F2AE0B61 for ; Wed, 1 Apr 2015 22:28:42 +0000 (UTC) Received: from x51r2.gaikai.org (unknown [100.42.98.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id CE6E6340873; Wed, 1 Apr 2015 22:28:41 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] dispatch_conf: use portage.os unicode wrapper (bug 545270) Date: Wed, 1 Apr 2015 15:28:31 -0700 Message-Id: <1427927311-29602-1-git-send-email-zmedico@gentoo.org> X-Mailer: git-send-email 2.3.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: 11298818-afdf-49b2-8db7-635e015503f0 X-Archives-Hash: 7a5151b5bedcdc45f878b4e37ee65b52 This avoids UnicodeDecodeError problems by using UTF-8 encoding regardless of the locale. X-Gentoo-Bug: 545270 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=545270 --- pym/portage/dispatch_conf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py index 790eacb..df02bf2 100644 --- a/pym/portage/dispatch_conf.py +++ b/pym/portage/dispatch_conf.py @@ -10,7 +10,6 @@ from __future__ import print_function, unicode_literals import io import functools -import os import shutil import stat import subprocess @@ -18,7 +17,7 @@ import sys import tempfile import portage -from portage import _encodings +from portage import _encodings, os from portage.env.loaders import KeyValuePairFileLoader from portage.localization import _ from portage.util import shlex_split, varexpand -- 2.3.1