<div class="gmail_quote">2012/5/27 <span dir="ltr"><<a href="mailto:chninkel@users.sourceforge.net" target="_blank">chninkel@users.sourceforge.net</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Revision: 18140<br>
<a href="http://gar.svn.sourceforge.net/gar/?rev=18140&view=rev" target="_blank">http://gar.svn.sourceforge.net/gar/?rev=18140&view=rev</a><br>
Author: chninkel<br>
Date: 2012-05-27 21:50:40 +0000 (Sun, 27 May 2012)<br>
Log Message:<br>
-----------<br>
no, None is not iterable...<br>
<br>
Modified Paths:<br>
--------------<br>
csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py<br>
<br>
Modified: csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py<br>
===================================================================<br>
--- csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py 2012-05-27 21:47:40 UTC (rev 18139)<br>
+++ csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py 2012-05-27 21:50:40 UTC (rev 18140)<br>
@@ -268,6 +268,8 @@<br>
streams_and_parsers = zip(streams, (self._ParsePkgmapLine, self._ParsePkgContentsLine))<br>
for stream_info in streams_and_parsers:<br>
parseMethod = stream_info[1]<br>
+ if stream_info[0] == None:<br>
+ continue<br></blockquote><div><br></div><div>The better Python idiom is:</div><div><br></div><div>if foo is None:</div><div> ...</div><div><br></div><div>but in this case, it's enough to test for the boolean value:</div>
<div><br></div><div>if not stream_info[0]:</div><div> continue</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
for line in stream_info[0]:<br>
if show_progress:<br>
if not c.next() % 1000:<br>
@@ -377,9 +379,10 @@<br>
for line in streams[0]:<br>
pkgname, pkg_desc = self._ParsePkginfoLine(line)<br>
packages_by_pkgname.setdefault(pkgname, pkg_desc)<br>
- for line in streams[1]:<br>
- pkgname, pkg_desc = self._ParsePkgListLine(line)<br>
- packages_by_pkgname.setdefault(pkgname, pkg_desc)<br>
+ if streams[1] != None:<br></blockquote><div><br></div><div>Same deal:</div><div><br></div><div>if streams[1]:</div><div> for line in streams[1]:</div><div> (...)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ for line in streams[1]:<br>
+ pkgname, pkg_desc = self._ParsePkgListLine(line)<br>
+ packages_by_pkgname.setdefault(pkgname, pkg_desc)<br>
logging.debug("<- _ParsePkginfoOutput()")<br>
return packages_by_pkgname<br>
<br>
<br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.<br>
<br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@lists.opencsw.org">devel@lists.opencsw.org</a><br>
<a href="https://lists.opencsw.org/mailman/listinfo/devel" target="_blank">https://lists.opencsw.org/mailman/listinfo/devel</a><br>
</blockquote></div><br>