summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui/puccho.py
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-06-18 07:56:55 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:37 +0100
commit20dc452614c991d1a4f5b7dcc1307cd03cba0c55 (patch)
tree096376554cde186c8abea965a84b842dd3b8ff24 /bitbake/lib/bb/ui/puccho.py
parentb9f8af16f4aca5df1849e0ee2904d58e120cb67d (diff)
downloadpoky-20dc452614c991d1a4f5b7dcc1307cd03cba0c55.tar.gz
Drop a couple usages of readlines
(Bitbake rev: 40925230781ddd550bf21d90714c5349f9240a51) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/ui/puccho.py')
-rw-r--r--bitbake/lib/bb/ui/puccho.py28
1 files changed, 14 insertions, 14 deletions
diff --git a/bitbake/lib/bb/ui/puccho.py b/bitbake/lib/bb/ui/puccho.py
index 2ac025303e..a627fc803f 100644
--- a/bitbake/lib/bb/ui/puccho.py
+++ b/bitbake/lib/bb/ui/puccho.py
@@ -24,6 +24,7 @@ import gtk.glade
24import threading 24import threading
25import urllib2 25import urllib2
26import os 26import os
27import contextlib
27 28
28from bb.ui.crumbs.buildmanager import BuildManager, BuildConfiguration 29from bb.ui.crumbs.buildmanager import BuildManager, BuildConfiguration
29from bb.ui.crumbs.buildmanager import BuildManagerTreeView 30from bb.ui.crumbs.buildmanager import BuildManagerTreeView
@@ -77,20 +78,19 @@ class MetaDataLoader(gobject.GObject):
77 def run (self): 78 def run (self):
78 result = {} 79 result = {}
79 try: 80 try:
80 f = urllib2.urlopen (self.url) 81 with contextlib.closing (urllib2.urlopen (self.url)) as f:
81 82 # Parse the metadata format. The format is....
82 # Parse the metadata format. The format is.... 83 # <machine>;<default distro>|<distro>...;<default image>|<image>...;<type##url>|...
83 # <machine>;<default distro>|<distro>...;<default image>|<image>...;<type##url>|... 84 for line in f:
84 for line in f.readlines(): 85 components = line.split(";")
85 components = line.split(";") 86 if (len (components) < 4):
86 if (len (components) < 4): 87 raise MetaDataLoader.LoaderThread.LoaderImportException
87 raise MetaDataLoader.LoaderThread.LoaderImportException 88 machine = components[0]
88 machine = components[0] 89 distros = components[1].split("|")
89 distros = components[1].split("|") 90 images = components[2].split("|")
90 images = components[2].split("|") 91 urls = components[3].split("|")
91 urls = components[3].split("|") 92
92 93 result[machine] = (distros, images, urls)
93 result[machine] = (distros, images, urls)
94 94
95 # Create an object representing this *potential* 95 # Create an object representing this *potential*
96 # configuration. It can become concrete if the machine, distro 96 # configuration. It can become concrete if the machine, distro