1 |
Author: zmedico |
2 |
Date: 2009-04-08 20:34:50 +0000 (Wed, 08 Apr 2009) |
3 |
New Revision: 13303 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Add UseFlagDisplay.sort_combined and sort_separated attributes that can be |
9 |
passed directly as key parameters to list.sort(). |
10 |
|
11 |
|
12 |
Modified: main/trunk/pym/_emerge/__init__.py |
13 |
=================================================================== |
14 |
--- main/trunk/pym/_emerge/__init__.py 2009-04-08 20:23:55 UTC (rev 13302) |
15 |
+++ main/trunk/pym/_emerge/__init__.py 2009-04-08 20:34:50 UTC (rev 13303) |
16 |
@@ -9252,15 +9252,16 @@ |
17 |
s = '(%s)' % s |
18 |
return s |
19 |
|
20 |
- @classmethod |
21 |
- def cmp_combined(cls, a, b): |
22 |
+ def _cmp_combined(a, b): |
23 |
""" |
24 |
Sort by name, combining enabled and disabled flags. |
25 |
""" |
26 |
return (a.name > b.name) - (a.name < b.name) |
27 |
|
28 |
- @classmethod |
29 |
- def cmp_separated(cls, a, b): |
30 |
+ sort_combined = cmp_sort_key(_cmp_combined) |
31 |
+ del _cmp_combined |
32 |
+ |
33 |
+ def _cmp_separated(a, b): |
34 |
""" |
35 |
Sort by name, separating enabled flags from disabled flags. |
36 |
""" |
37 |
@@ -9269,6 +9270,9 @@ |
38 |
return enabled_diff |
39 |
return (a.name > b.name) - (a.name < b.name) |
40 |
|
41 |
+ sort_separated = cmp_sort_key(_cmp_separated) |
42 |
+ del _cmp_separated |
43 |
+ |
44 |
class PollSelectAdapter(PollConstants): |
45 |
|
46 |
""" |
47 |
@@ -13687,9 +13691,9 @@ |
48 |
for f in use_disabled.get(varname, []): |
49 |
flags.append(UseFlagDisplay(f, False, f in forced_flags)) |
50 |
if alphabetical_use: |
51 |
- flags.sort(key=cmp_sort_key(UseFlagDisplay.cmp_combined)) |
52 |
+ flags.sort(key=UseFlagDisplay.sort_combined) |
53 |
else: |
54 |
- flags.sort(key=cmp_sort_key(UseFlagDisplay.cmp_separated)) |
55 |
+ flags.sort(key=UseFlagDisplay.sort_separated) |
56 |
print '%s="%s"' % (varname, ' '.join(str(f) for f in flags)), |
57 |
print |