diff options
| author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-25 05:29:02 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-25 05:29:02 +0000 |
| commit | 6379e5dd27b5fd76939ac7d3a0ba07520451cd90 (patch) | |
| tree | 27fa3c4348002b83efbb3239fb4218adb62cc4c7 /bin/regenworld | |
| parent | f4d22626f9815776991ff051a8bde162af7b4be8 (diff) | |
| download | portage-6379e5dd27b5fd76939ac7d3a0ba07520451cd90.tar.gz portage-6379e5dd27b5fd76939ac7d3a0ba07520451cd90.tar.bz2 portage-6379e5dd27b5fd76939ac7d3a0ba07520451cd90.zip | |
Use list comprehensions instead of filter() or map() in some places for compatibility with Python 3.
svn path=/main/trunk/; revision=14421
Diffstat (limited to 'bin/regenworld')
| -rwxr-xr-x | bin/regenworld | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/bin/regenworld b/bin/regenworld index de082db41..f5b30bd49 100755 --- a/bin/regenworld +++ b/bin/regenworld @@ -58,18 +58,16 @@ if len(sys.argv) >= 2 and sys.argv[1] in ["-h", "--help"]: sys.exit(0) worldlist = portage.grabfile(os.path.join("/", portage.WORLD_FILE)) -syslist = portage.settings.packages -syslist = filter(issyspkg, syslist) +syslist = [x for x in portage.settings.packages if issyspkg(x)] logfile = portage.grabfile("/var/log/emerge.log") -biglist = filter(iscandidate, logfile) -biglist = map(getpkginfo, biglist) +biglist = [getpkginfo(x) for x in logfile if iscandidate(x)] tmplist = [] for l in biglist: tmplist += l.split() -biglist = filter(isunwanted, tmplist) +biglist = [x for x in tmplist if isunwanted(x)] #for p in biglist: -# print p +# print(p) #sys.exit(0) # resolving virtuals @@ -77,7 +75,7 @@ realsyslist = [] for mykey in syslist: # drop the asterix mykey = mykey[1:] - #print "candidate:",mykey + #print("candidate:",mykey) mylist=portage.db["/"]["vartree"].dbapi.match(mykey) if mylist: mykey=portage.cpv_getkey(mylist[0]) @@ -85,7 +83,7 @@ for mykey in syslist: realsyslist.append(mykey) for mykey in biglist: - #print "checking:",mykey + #print("checking:",mykey) try: mylist=portage.db["/"]["vartree"].dbapi.match(mykey) except (portage.exception.InvalidAtom, KeyError): |