Merge lp:~cr3/checkbox/954587 into lp:checkbox

[Marc Tardif]

[Daniel Manrique (roadmr)]

Awesome, thanks!

Merging...

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-21 22:09:17 +0000
+++ debian/changelog	2012-03-26 19:45:28 +0000
@@ -8,12 +8,15 @@
   * plugins/jobs_info.py: Checkbox doesn't warn that invalid whitelist patterns
     are being used (LP: #937651)
   
+  [Marc Tardif]
+  * Fixed string_to_type conversion in network_bandwidth_test (LP: #954587)
+
   [Sylvain Pineau]
   * qt/frontend/qtfront.cpp, qt/frontend/qtfront.h, plugins/suites_prompt.py,
     checkbox_qt/qt_interface.py, plugins/jobs_prompt.py: The selection tree is
     now updated when recovering from a previous run (LP: #937696)
 
- -- Jeff Lane <[e-mail]>  Wed, 21 Mar 2012 18:08:46 -0400
+ -- Marc Tardif <[e-mail]>  Mon, 26 Mar 2012 15:40:48 -0400
 
 checkbox (0.13.5) precise; urgency=low
 

=== modified file 'scripts/network_bandwidth_test'
--- scripts/network_bandwidth_test	2011-07-15 18:35:30 +0000
+++ scripts/network_bandwidth_test	2012-03-26 19:45:28 +0000
@@ -13,27 +13,7 @@
 from logging import StreamHandler, FileHandler, Formatter
 from optparse import OptionParser
 
-
-def string_to_type(string):
-    conversion_table = {
-        "(yes|true)": lambda v: True,
-        "(no|false)": lambda v: False,
-        "\d+\.\d+": lambda v: float(v.group(0)),
-        "(\d+)( ?b)?": lambda v: int(v.group(1)),
-        "(\d+) ?kb": lambda v: int(v.group(1)) * 1024,
-        "(\d+) ?mb": lambda v: int(v.group(1)) * 1024 * 1024,
-        "(\d+) ?gb": lambda v: int(v.group(1)) * 1024 * 1024 * 1024,
-        "(\d+)( ?hz)?": lambda v: int(v.group(1)),
-        "(\d+) ?khz": lambda v: int(v.group(1)) * 1024,
-        "(\d+) ?mhz": lambda v: int(v.group(1)) * 1024 * 1024,
-        "(\d+) ?ghz": lambda v: int(v.group(1)) * 1024 * 1024 * 1024}
-
-    for regex, func in conversion_table.items():
-        match = re.match("^%s$" % regex, string, re.IGNORECASE)
-        if match:
-            return func(match)
-
-    return string
+from checkbox.lib.conversion import string_to_type
 
 
 class CommandException(Exception):
@@ -496,7 +476,7 @@
     #http://projects.gnome.org/NetworkManager/developers/
     #NetworkManager D-Bus API Specifications, look for the
     #NM_STATE enumeration to see which statuses indicate connection
-    #established and put them in this list. "3" works for NM 0.7 
+    #established and put them in this list. "3" works for NM 0.7
     #and 0.8, while "60" and "70" work for NM 0.9.
     STATES_CONNECTED = [3, 60, 70]
 
@@ -515,7 +495,7 @@
 
     def is_connected(self):
         state = self.nm_service.state()
-        return state in self.STATES_CONNECTED 
+        return state in self.STATES_CONNECTED
 
 
 class Application(object):