Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH v2] dispatch_conf: use portage.os, shutil unicode wrappers (bug 545270)
Date: Wed, 01 Apr 2015 22:43:43
Message-Id: 1427928208-30192-1-git-send-email-zmedico@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH] dispatch_conf: use portage.os unicode wrapper (bug 545270) by Zac Medico
1 This avoids UnicodeDecodeError problems by using UTF-8 encoding
2 regardless of the locale.
3
4 X-Gentoo-Bug: 545270
5 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=545270
6 ---
7 [PATCH v2] adds portage.shutil to the imports
8
9 pym/portage/dispatch_conf.py | 4 +---
10 1 file changed, 1 insertion(+), 3 deletions(-)
11
12 diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
13 index 790eacb..98939fd 100644
14 --- a/pym/portage/dispatch_conf.py
15 +++ b/pym/portage/dispatch_conf.py
16 @@ -10,15 +10,13 @@ from __future__ import print_function, unicode_literals
17
18 import io
19 import functools
20 -import os
21 -import shutil
22 import stat
23 import subprocess
24 import sys
25 import tempfile
26
27 import portage
28 -from portage import _encodings
29 +from portage import _encodings, os, shutil
30 from portage.env.loaders import KeyValuePairFileLoader
31 from portage.localization import _
32 from portage.util import shlex_split, varexpand
33 --
34 2.3.1