1 |
commit: e351a8cbd4d40999642c93af9762253cb9753c4c |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 12 17:32:09 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 12 17:32:09 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e351a8cb |
7 |
|
8 |
Remove unneeded _unicode_decode for io.StringIO. |
9 |
|
10 |
Since StringIO.StringIO fallback was removed in commit |
11 |
5df96179611ce0e98727945b1800b43daccedfc2, we can rely on |
12 |
io.StringIO.getoutput() to return unicode, so there's no |
13 |
need to call _unicode_decode on the result. |
14 |
|
15 |
--- |
16 |
pym/_emerge/AbstractEbuildProcess.py | 5 +---- |
17 |
pym/_emerge/BinpkgVerifier.py | 5 +---- |
18 |
pym/_emerge/EbuildFetcher.py | 3 +-- |
19 |
pym/_emerge/EbuildPhase.py | 13 ++++--------- |
20 |
pym/portage/package/ebuild/_ipc/QueryCommand.py | 4 +--- |
21 |
5 files changed, 8 insertions(+), 22 deletions(-) |
22 |
|
23 |
diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py |
24 |
index 49b85eb..4147ecb 100644 |
25 |
--- a/pym/_emerge/AbstractEbuildProcess.py |
26 |
+++ b/pym/_emerge/AbstractEbuildProcess.py |
27 |
@@ -13,8 +13,6 @@ from portage.localization import _ |
28 |
from portage.package.ebuild._ipc.ExitCommand import ExitCommand |
29 |
from portage.package.ebuild._ipc.QueryCommand import QueryCommand |
30 |
from portage import os |
31 |
-from portage import _encodings |
32 |
-from portage import _unicode_decode |
33 |
from portage.util._pty import _create_pty_or_pipe |
34 |
from portage.util import apply_secpass_permissions |
35 |
|
36 |
@@ -226,8 +224,7 @@ class AbstractEbuildProcess(SpawnProcess): |
37 |
elog_func(line, phase=phase, key=self.settings.mycpv, out=out) |
38 |
finally: |
39 |
portage.output.havecolor = global_havecolor |
40 |
- msg = _unicode_decode(out.getvalue(), |
41 |
- encoding=_encodings['content'], errors='replace') |
42 |
+ msg = out.getvalue() |
43 |
if msg: |
44 |
log_path = None |
45 |
if self.settings.get("PORTAGE_BACKGROUND") != "subprocess": |
46 |
|
47 |
diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.py |
48 |
index 91dc8a7..0052967 100644 |
49 |
--- a/pym/_emerge/BinpkgVerifier.py |
50 |
+++ b/pym/_emerge/BinpkgVerifier.py |
51 |
@@ -7,8 +7,6 @@ import io |
52 |
import sys |
53 |
import portage |
54 |
from portage import os |
55 |
-from portage import _encodings |
56 |
-from portage import _unicode_decode |
57 |
from portage.package.ebuild.fetch import _checksum_failure_temp_file |
58 |
|
59 |
class BinpkgVerifier(AsynchronousTask): |
60 |
@@ -67,8 +65,7 @@ class BinpkgVerifier(AsynchronousTask): |
61 |
sys.stderr = stderr_orig |
62 |
portage.output.havecolor = global_havecolor |
63 |
|
64 |
- msg = _unicode_decode(out.getvalue(), |
65 |
- encoding=_encodings['content'], errors='replace') |
66 |
+ msg = out.getvalue() |
67 |
if msg: |
68 |
self.scheduler.output(msg, log_path=self.logfile, |
69 |
background=self.background) |
70 |
|
71 |
diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py |
72 |
index f67819c..c076288 100644 |
73 |
--- a/pym/_emerge/EbuildFetcher.py |
74 |
+++ b/pym/_emerge/EbuildFetcher.py |
75 |
@@ -189,8 +189,7 @@ class EbuildFetcher(SpawnProcess): |
76 |
out = io.StringIO() |
77 |
for line in lines: |
78 |
eerror(line, phase="unpack", key=self.pkg.cpv, out=out) |
79 |
- msg = _unicode_decode(out.getvalue(), |
80 |
- encoding=_encodings['content'], errors='replace') |
81 |
+ msg = out.getvalue() |
82 |
if msg: |
83 |
self.scheduler.output(msg, log_path=self.logfile) |
84 |
|
85 |
|
86 |
diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py |
87 |
index c7f5b88..f53570a 100644 |
88 |
--- a/pym/_emerge/EbuildPhase.py |
89 |
+++ b/pym/_emerge/EbuildPhase.py |
90 |
@@ -25,7 +25,6 @@ portage.proxy.lazyimport.lazyimport(globals(), |
91 |
) |
92 |
from portage import os |
93 |
from portage import _encodings |
94 |
-from portage import _unicode_decode |
95 |
from portage import _unicode_encode |
96 |
|
97 |
class EbuildPhase(CompositeTask): |
98 |
@@ -193,8 +192,7 @@ class EbuildPhase(CompositeTask): |
99 |
if self.phase == "install": |
100 |
out = io.StringIO() |
101 |
_check_build_log(self.settings, out=out) |
102 |
- msg = _unicode_decode(out.getvalue(), |
103 |
- encoding=_encodings['content'], errors='replace') |
104 |
+ msg = out.getvalue() |
105 |
self.scheduler.output(msg, log_path=logfile) |
106 |
|
107 |
if fail: |
108 |
@@ -208,8 +206,7 @@ class EbuildPhase(CompositeTask): |
109 |
out = io.StringIO() |
110 |
_post_src_install_chost_fix(settings) |
111 |
_post_src_install_uid_fix(settings, out) |
112 |
- msg = _unicode_decode(out.getvalue(), |
113 |
- encoding=_encodings['content'], errors='replace') |
114 |
+ msg = out.getvalue() |
115 |
if msg: |
116 |
self.scheduler.output(msg, log_path=logfile) |
117 |
elif self.phase == "preinst": |
118 |
@@ -263,8 +260,7 @@ class EbuildPhase(CompositeTask): |
119 |
if self.phase == "install": |
120 |
out = io.StringIO() |
121 |
_post_src_install_soname_symlinks(self.settings, out) |
122 |
- msg = _unicode_decode(out.getvalue(), |
123 |
- encoding=_encodings['content'], errors='replace') |
124 |
+ msg = out.getvalue() |
125 |
if msg: |
126 |
self.scheduler.output(msg, log_path=log_path) |
127 |
|
128 |
@@ -344,8 +340,7 @@ class EbuildPhase(CompositeTask): |
129 |
elog_func(line, phase=phase, key=self.settings.mycpv, out=out) |
130 |
finally: |
131 |
portage.output.havecolor = global_havecolor |
132 |
- msg = _unicode_decode(out.getvalue(), |
133 |
- encoding=_encodings['content'], errors='replace') |
134 |
+ msg = out.getvalue() |
135 |
if msg: |
136 |
log_path = None |
137 |
if self.settings.get("PORTAGE_BACKGROUND") != "subprocess": |
138 |
|
139 |
diff --git a/pym/portage/package/ebuild/_ipc/QueryCommand.py b/pym/portage/package/ebuild/_ipc/QueryCommand.py |
140 |
index 5e1533f..fb6e61e 100644 |
141 |
--- a/pym/portage/package/ebuild/_ipc/QueryCommand.py |
142 |
+++ b/pym/portage/package/ebuild/_ipc/QueryCommand.py |
143 |
@@ -5,7 +5,6 @@ import io |
144 |
|
145 |
import portage |
146 |
from portage import os |
147 |
-from portage import _encodings |
148 |
from portage import _unicode_decode |
149 |
from portage.dep import Atom |
150 |
from portage.elog import messages as elog_messages |
151 |
@@ -95,6 +94,5 @@ class QueryCommand(IpcCommand): |
152 |
elog_func(line, phase=phase, key=self.settings.mycpv, out=out) |
153 |
finally: |
154 |
portage.output.havecolor = global_havecolor |
155 |
- msg = _unicode_decode(out.getvalue(), |
156 |
- encoding=_encodings['content'], errors='replace') |
157 |
+ msg = out.getvalue() |
158 |
return msg |