1 |
Author: zmedico |
2 |
Date: 2009-06-17 19:31:57 +0000 (Wed, 17 Jun 2009) |
3 |
New Revision: 13648 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/portage/output.py |
7 |
Log: |
8 |
Rename color_codes back to codes. |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/portage/output.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/portage/output.py 2009-06-17 19:27:20 UTC (rev 13647) |
14 |
+++ main/trunk/pym/portage/output.py 2009-06-17 19:31:57 UTC (rev 13648) |
15 |
@@ -28,90 +28,90 @@ |
16 |
_styles = {} |
17 |
"""Maps style class to tuple of attribute names.""" |
18 |
|
19 |
-color_codes = {} |
20 |
+codes = {} |
21 |
"""Maps attribute name to ansi code.""" |
22 |
|
23 |
esc_seq = "\x1b[" |
24 |
|
25 |
-color_codes["normal"] = esc_seq + "0m" |
26 |
-color_codes["reset"] = esc_seq + "39;49;00m" |
27 |
+codes["normal"] = esc_seq + "0m" |
28 |
+codes["reset"] = esc_seq + "39;49;00m" |
29 |
|
30 |
-color_codes["bold"] = esc_seq + "01m" |
31 |
-color_codes["faint"] = esc_seq + "02m" |
32 |
-color_codes["standout"] = esc_seq + "03m" |
33 |
-color_codes["underline"] = esc_seq + "04m" |
34 |
-color_codes["blink"] = esc_seq + "05m" |
35 |
-color_codes["overline"] = esc_seq + "06m" |
36 |
-color_codes["reverse"] = esc_seq + "07m" |
37 |
-color_codes["invisible"] = esc_seq + "08m" |
38 |
+codes["bold"] = esc_seq + "01m" |
39 |
+codes["faint"] = esc_seq + "02m" |
40 |
+codes["standout"] = esc_seq + "03m" |
41 |
+codes["underline"] = esc_seq + "04m" |
42 |
+codes["blink"] = esc_seq + "05m" |
43 |
+codes["overline"] = esc_seq + "06m" |
44 |
+codes["reverse"] = esc_seq + "07m" |
45 |
+codes["invisible"] = esc_seq + "08m" |
46 |
|
47 |
-color_codes["no-attr"] = esc_seq + "22m" |
48 |
-color_codes["no-standout"] = esc_seq + "23m" |
49 |
-color_codes["no-underline"] = esc_seq + "24m" |
50 |
-color_codes["no-blink"] = esc_seq + "25m" |
51 |
-color_codes["no-overline"] = esc_seq + "26m" |
52 |
-color_codes["no-reverse"] = esc_seq + "27m" |
53 |
+codes["no-attr"] = esc_seq + "22m" |
54 |
+codes["no-standout"] = esc_seq + "23m" |
55 |
+codes["no-underline"] = esc_seq + "24m" |
56 |
+codes["no-blink"] = esc_seq + "25m" |
57 |
+codes["no-overline"] = esc_seq + "26m" |
58 |
+codes["no-reverse"] = esc_seq + "27m" |
59 |
|
60 |
-color_codes["bg_black"] = esc_seq + "40m" |
61 |
-color_codes["bg_darkred"] = esc_seq + "41m" |
62 |
-color_codes["bg_darkgreen"] = esc_seq + "42m" |
63 |
-color_codes["bg_brown"] = esc_seq + "43m" |
64 |
-color_codes["bg_darkblue"] = esc_seq + "44m" |
65 |
-color_codes["bg_purple"] = esc_seq + "45m" |
66 |
-color_codes["bg_teal"] = esc_seq + "46m" |
67 |
-color_codes["bg_lightgray"] = esc_seq + "47m" |
68 |
-color_codes["bg_default"] = esc_seq + "49m" |
69 |
-color_codes["bg_darkyellow"] = color_codes["bg_brown"] |
70 |
+codes["bg_black"] = esc_seq + "40m" |
71 |
+codes["bg_darkred"] = esc_seq + "41m" |
72 |
+codes["bg_darkgreen"] = esc_seq + "42m" |
73 |
+codes["bg_brown"] = esc_seq + "43m" |
74 |
+codes["bg_darkblue"] = esc_seq + "44m" |
75 |
+codes["bg_purple"] = esc_seq + "45m" |
76 |
+codes["bg_teal"] = esc_seq + "46m" |
77 |
+codes["bg_lightgray"] = esc_seq + "47m" |
78 |
+codes["bg_default"] = esc_seq + "49m" |
79 |
+codes["bg_darkyellow"] = codes["bg_brown"] |
80 |
|
81 |
def color(fg, bg="default", attr=["normal"]): |
82 |
- mystr = color_codes[fg] |
83 |
+ mystr = codes[fg] |
84 |
for x in [bg]+attr: |
85 |
- mystr += color_codes[x] |
86 |
+ mystr += codes[x] |
87 |
return mystr |
88 |
|
89 |
|
90 |
-ansi_color_codes = [] |
91 |
+ansi_codes = [] |
92 |
for x in xrange(30, 38): |
93 |
- ansi_color_codes.append("%im" % x) |
94 |
- ansi_color_codes.append("%i;01m" % x) |
95 |
+ ansi_codes.append("%im" % x) |
96 |
+ ansi_codes.append("%i;01m" % x) |
97 |
|
98 |
rgb_ansi_colors = ['0x000000', '0x555555', '0xAA0000', '0xFF5555', '0x00AA00', |
99 |
'0x55FF55', '0xAA5500', '0xFFFF55', '0x0000AA', '0x5555FF', '0xAA00AA', |
100 |
'0xFF55FF', '0x00AAAA', '0x55FFFF', '0xAAAAAA', '0xFFFFFF'] |
101 |
|
102 |
for x in xrange(len(rgb_ansi_colors)): |
103 |
- color_codes[rgb_ansi_colors[x]] = esc_seq + ansi_color_codes[x] |
104 |
+ codes[rgb_ansi_colors[x]] = esc_seq + ansi_codes[x] |
105 |
|
106 |
del x |
107 |
|
108 |
-color_codes["black"] = color_codes["0x000000"] |
109 |
-color_codes["darkgray"] = color_codes["0x555555"] |
110 |
+codes["black"] = codes["0x000000"] |
111 |
+codes["darkgray"] = codes["0x555555"] |
112 |
|
113 |
-color_codes["red"] = color_codes["0xFF5555"] |
114 |
-color_codes["darkred"] = color_codes["0xAA0000"] |
115 |
+codes["red"] = codes["0xFF5555"] |
116 |
+codes["darkred"] = codes["0xAA0000"] |
117 |
|
118 |
-color_codes["green"] = color_codes["0x55FF55"] |
119 |
-color_codes["darkgreen"] = color_codes["0x00AA00"] |
120 |
+codes["green"] = codes["0x55FF55"] |
121 |
+codes["darkgreen"] = codes["0x00AA00"] |
122 |
|
123 |
-color_codes["yellow"] = color_codes["0xFFFF55"] |
124 |
-color_codes["brown"] = color_codes["0xAA5500"] |
125 |
+codes["yellow"] = codes["0xFFFF55"] |
126 |
+codes["brown"] = codes["0xAA5500"] |
127 |
|
128 |
-color_codes["blue"] = color_codes["0x5555FF"] |
129 |
-color_codes["darkblue"] = color_codes["0x0000AA"] |
130 |
+codes["blue"] = codes["0x5555FF"] |
131 |
+codes["darkblue"] = codes["0x0000AA"] |
132 |
|
133 |
-color_codes["fuchsia"] = color_codes["0xFF55FF"] |
134 |
-color_codes["purple"] = color_codes["0xAA00AA"] |
135 |
+codes["fuchsia"] = codes["0xFF55FF"] |
136 |
+codes["purple"] = codes["0xAA00AA"] |
137 |
|
138 |
-color_codes["turquoise"] = color_codes["0x55FFFF"] |
139 |
-color_codes["teal"] = color_codes["0x00AAAA"] |
140 |
+codes["turquoise"] = codes["0x55FFFF"] |
141 |
+codes["teal"] = codes["0x00AAAA"] |
142 |
|
143 |
-color_codes["white"] = color_codes["0xFFFFFF"] |
144 |
-color_codes["lightgray"] = color_codes["0xAAAAAA"] |
145 |
+codes["white"] = codes["0xFFFFFF"] |
146 |
+codes["lightgray"] = codes["0xAAAAAA"] |
147 |
|
148 |
-color_codes["darkteal"] = color_codes["turquoise"] |
149 |
+codes["darkteal"] = codes["turquoise"] |
150 |
# Some terminals have darkyellow instead of brown. |
151 |
-color_codes["0xAAAA00"] = color_codes["brown"] |
152 |
-color_codes["darkyellow"] = color_codes["0xAAAA00"] |
153 |
+codes["0xAAAA00"] = codes["brown"] |
154 |
+codes["darkyellow"] = codes["0xAAAA00"] |
155 |
|
156 |
|
157 |
|
158 |
@@ -182,7 +182,7 @@ |
159 |
|
160 |
k = strip_quotes(split_line[0].strip()) |
161 |
v = strip_quotes(split_line[1].strip()) |
162 |
- if not k in _styles and not k in color_codes: |
163 |
+ if not k in _styles and not k in codes: |
164 |
e = ParseError("'%s', line %s: %s'%s'" % ( |
165 |
myfile, lineno, |
166 |
"Unknown variable: ", k)) |
167 |
@@ -194,16 +194,16 @@ |
168 |
if ansi_code_pattern.match(v): |
169 |
if k in _styles: |
170 |
_styles[k] = ( esc_seq + v, ) |
171 |
- elif k in color_codes: |
172 |
- color_codes[k] = esc_seq + v |
173 |
+ elif k in codes: |
174 |
+ codes[k] = esc_seq + v |
175 |
else: |
176 |
code_list = [] |
177 |
for x in v.split(): |
178 |
- if x in color_codes: |
179 |
+ if x in codes: |
180 |
if k in _styles: |
181 |
code_list.append(x) |
182 |
- elif k in color_codes: |
183 |
- code_list.append(color_codes[x]) |
184 |
+ elif k in codes: |
185 |
+ code_list.append(codes[x]) |
186 |
else: |
187 |
e = ParseError("'%s', line %s: %s'%s'" % ( |
188 |
myfile, lineno, |
189 |
@@ -214,8 +214,8 @@ |
190 |
raise e |
191 |
if k in _styles: |
192 |
_styles[k] = tuple(code_list) |
193 |
- elif k in color_codes: |
194 |
- color_codes[k] = "".join(code_list) |
195 |
+ elif k in codes: |
196 |
+ codes[k] = "".join(code_list) |
197 |
except (IOError, OSError), e: |
198 |
if e.errno == errno.ENOENT: |
199 |
raise FileNotFound(myfile) |
200 |
@@ -288,7 +288,7 @@ |
201 |
havecolor=0 |
202 |
|
203 |
def resetColor(): |
204 |
- return color_codes["reset"] |
205 |
+ return codes["reset"] |
206 |
|
207 |
def style_to_ansi_code(style): |
208 |
""" |
209 |
@@ -299,18 +299,18 @@ |
210 |
used to render the given style. |
211 |
""" |
212 |
ret = "" |
213 |
- for color_code in _styles[style]: |
214 |
+ for attr_name in _styles[style]: |
215 |
# allow stuff that has found it's way through ansi_code_pattern |
216 |
- ret += color_codes.get(color_code, color_code) |
217 |
+ ret += codes.get(attr_name, attr_name) |
218 |
return ret |
219 |
|
220 |
def colorize(color_key, text): |
221 |
global havecolor |
222 |
if havecolor: |
223 |
- if color_key in color_codes: |
224 |
- return color_codes[color_key] + text + color_codes["reset"] |
225 |
+ if color_key in codes: |
226 |
+ return codes[color_key] + text + codes["reset"] |
227 |
elif color_key in _styles: |
228 |
- return style_to_ansi_code(color_key) + text + color_codes["reset"] |
229 |
+ return style_to_ansi_code(color_key) + text + codes["reset"] |
230 |
else: |
231 |
return text |
232 |
else: |
233 |
@@ -351,7 +351,7 @@ |
234 |
for style in self._styles: |
235 |
self._file.write(style_to_ansi_code(style)) |
236 |
self._file.write(s) |
237 |
- self._file.write(color_codes["reset"]) |
238 |
+ self._file.write(codes["reset"]) |
239 |
else: |
240 |
self._file.write(s) |
241 |
if self.write_listener: |