Merge lp:~bladernr/checkbox/1180496-fix-cpuinfo-parser into lp:checkbox

[Jeff Lane ]

Fixed issue in cpuinfo parser that caused it to traceback when a line had more than one ':'
pep8 fix of a minor issue found while cleaning this up for submission.

[Daniel Manrique (roadmr)]

Looks good, thanks for fixing this!

review: Approve

=== modified file 'checkbox/parsers/cpuinfo.py'
--- checkbox/parsers/cpuinfo.py	2012-05-31 20:14:26 +0000
+++ checkbox/parsers/cpuinfo.py	2013-05-15 18:49:24 +0000
@@ -46,8 +46,7 @@
             for line in block.split("\n"):
                 if not line:
                     continue
-
-                key, value = line.split(":")
+                key, value = line.split(":", 1)
                 key, value = key.strip(), value.strip()
 
                 # Handle bogomips on sparc
@@ -135,7 +134,7 @@
                 for pkey, ckey in conversion.items():
                     if isinstance(ckey, (list, tuple)):
                         processor[pkey] = "/".join([attributes[k]
-                            for k in ckey])
+                                                    for k in ckey])
                     elif ckey in attributes:
                         processor[pkey] = attributes[ckey]
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-14 22:26:39 +0000
+++ debian/changelog	2013-05-15 18:49:24 +0000
@@ -12,6 +12,11 @@
   [ Daniel Manrique ]
   * Ensured that button strings from the "continue" dialog are translatable
     (LP: #1176695) 
+  
+  [ Jeff Lane ]
+  * checkbox/parsers/cpuinfo.py - split on first instance of ':' in cpuinfo
+    output lines to avoid splitting into more than 2 items. Also fixed a pep8
+    issue discovered while working on this. (LP: #1180496)
 
  -- Brendan Donegan <[e-mail]>  Tue, 07 May 2013 19:21:05 +0100