| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-01 12:50:41 +0000 (Tue, 01 Jul 2008) |
| 3 |
New Revision: 10873 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/elog/__init__.py |
| 7 |
main/trunk/pym/portage/elog/filtering.py |
| 8 |
main/trunk/pym/portage/elog/messages.py |
| 9 |
main/trunk/pym/portage/elog/mod_mail.py |
| 10 |
main/trunk/pym/portage/elog/mod_mail_summary.py |
| 11 |
Log: |
| 12 |
Py3k compatibility patch #4 by Ali Polatel <hawking@g.o>. |
| 13 |
Replace dict.has_key() calls with "in" and "not in" operators. |
| 14 |
|
| 15 |
|
| 16 |
Modified: main/trunk/pym/portage/elog/__init__.py |
| 17 |
=================================================================== |
| 18 |
--- main/trunk/pym/portage/elog/__init__.py 2008-07-01 12:48:57 UTC (rev 10872) |
| 19 |
+++ main/trunk/pym/portage/elog/__init__.py 2008-07-01 12:50:41 UTC (rev 10873) |
| 20 |
@@ -73,13 +73,13 @@ |
| 21 |
|
| 22 |
ebuild_logentries = collect_ebuild_messages(os.path.join(mysettings["T"], "logging")) |
| 23 |
all_logentries = collect_messages() |
| 24 |
- if all_logentries.has_key(cpv): |
| 25 |
+ if cpv in all_logentries: |
| 26 |
all_logentries[cpv] = _merge_logentries(ebuild_logentries, all_logentries[cpv]) |
| 27 |
else: |
| 28 |
all_logentries[cpv] = ebuild_logentries |
| 29 |
|
| 30 |
for key in _preserve_logentries.keys(): |
| 31 |
- if all_logentries.has_key(key): |
| 32 |
+ if key in all_logentries: |
| 33 |
all_logentries[key] = _merge_logentries(_preserve_logentries[key], all_logentries[key]) |
| 34 |
else: |
| 35 |
all_logentries[key] = _preserve_logentries[key] |
| 36 |
|
| 37 |
Modified: main/trunk/pym/portage/elog/filtering.py |
| 38 |
=================================================================== |
| 39 |
--- main/trunk/pym/portage/elog/filtering.py 2008-07-01 12:48:57 UTC (rev 10872) |
| 40 |
+++ main/trunk/pym/portage/elog/filtering.py 2008-07-01 12:50:41 UTC (rev 10873) |
| 41 |
@@ -12,7 +12,7 @@ |
| 42 |
for phase in logentries: |
| 43 |
for msgtype, msgcontent in logentries[phase]: |
| 44 |
if msgtype.upper() in loglevels or "*" in loglevels: |
| 45 |
- if not rValue.has_key(phase): |
| 46 |
+ if phase not in rValue: |
| 47 |
rValue[phase] = [] |
| 48 |
rValue[phase].append((msgtype, msgcontent)) |
| 49 |
return rValue |
| 50 |
|
| 51 |
Modified: main/trunk/pym/portage/elog/messages.py |
| 52 |
=================================================================== |
| 53 |
--- main/trunk/pym/portage/elog/messages.py 2008-07-01 12:48:57 UTC (rev 10872) |
| 54 |
+++ main/trunk/pym/portage/elog/messages.py 2008-07-01 12:50:41 UTC (rev 10873) |
| 55 |
@@ -76,9 +76,9 @@ |
| 56 |
if color == None: |
| 57 |
color = "GOOD" |
| 58 |
print colorize(color, " * ")+msg |
| 59 |
- if not _msgbuffer.has_key(key): |
| 60 |
+ if key not in _msgbuffer: |
| 61 |
_msgbuffer[key] = {} |
| 62 |
- if not _msgbuffer[key].has_key(phase): |
| 63 |
+ if phase not in _msgbuffer[key]: |
| 64 |
_msgbuffer[key][phase] = [] |
| 65 |
_msgbuffer[key][phase].append((level, msg)) |
| 66 |
|
| 67 |
|
| 68 |
Modified: main/trunk/pym/portage/elog/mod_mail.py |
| 69 |
=================================================================== |
| 70 |
--- main/trunk/pym/portage/elog/mod_mail.py 2008-07-01 12:48:57 UTC (rev 10872) |
| 71 |
+++ main/trunk/pym/portage/elog/mod_mail.py 2008-07-01 12:50:41 UTC (rev 10873) |
| 72 |
@@ -8,7 +8,7 @@ |
| 73 |
from portage.util import writemsg |
| 74 |
|
| 75 |
def process(mysettings, key, logentries, fulltext): |
| 76 |
- if mysettings.has_key("PORTAGE_ELOG_MAILURI"): |
| 77 |
+ if "PORTAGE_ELOG_MAILURI" in mysettings: |
| 78 |
myrecipient = mysettings["PORTAGE_ELOG_MAILURI"].split()[0] |
| 79 |
else: |
| 80 |
myrecipient = "root@localhost" |
| 81 |
|
| 82 |
Modified: main/trunk/pym/portage/elog/mod_mail_summary.py |
| 83 |
=================================================================== |
| 84 |
--- main/trunk/pym/portage/elog/mod_mail_summary.py 2008-07-01 12:48:57 UTC (rev 10872) |
| 85 |
+++ main/trunk/pym/portage/elog/mod_mail_summary.py 2008-07-01 12:50:41 UTC (rev 10873) |
| 86 |
@@ -33,7 +33,7 @@ |
| 87 |
count = "one package" |
| 88 |
else: |
| 89 |
count = "multiple packages" |
| 90 |
- if mysettings.has_key("PORTAGE_ELOG_MAILURI"): |
| 91 |
+ if "PORTAGE_ELOG_MAILURI" in mysettings: |
| 92 |
myrecipient = mysettings["PORTAGE_ELOG_MAILURI"].split()[0] |
| 93 |
else: |
| 94 |
myrecipient = "root@localhost" |
| 95 |
|
| 96 |
-- |
| 97 |
gentoo-commits@l.g.o mailing list |
Archives