Merge lp:~brendan-donegan/checkbox/bug1173103_user_interface_showSubmitToHexr into lp:checkbox

[Brendan Donegan]

There were a couple of latent issues left in some of the UI modules after the submitToHexr work. First, user_interface.py used the wrong keyword argument, and second cli_interface.py didn't return a tuple. This branch fixes both of these issues.

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'checkbox/user_interface.py'
--- checkbox/user_interface.py	2013-04-24 13:45:51 +0000
+++ checkbox/user_interface.py	2013-04-26 09:49:28 +0000
@@ -131,8 +131,8 @@
     def show_text(self, text, previous=None, next=None):
         return
 
-    def show_entry(self, text, value, label=None, submitToHexr=False, previous=None, next=None):
-        return (value, submitToHexr)
+    def show_entry(self, text, value, label=None, showSubmitToHexr=False, previous=None, next=None):
+        return (value, False)
 
     def show_check(self, text, options=[], default=[]):
         return default
 
=== modified file 'checkbox_cli/cli_interface.py'
--- checkbox_cli/cli_interface.py	2013-04-24 13:45:51 +0000
+++ checkbox_cli/cli_interface.py	2013-04-26 09:49:28 +0000
@@ -345,7 +345,7 @@
     def show_entry(self, text, value, showSubmitToHexr=False, label=None, previous=None, next=None):
         dialog = CLILineDialog(text)
 
-        return dialog.run()
+        return (dialog.run(), False)
 
     def show_check(self, text, options=[], default=[]):
         dialog = CLIChoiceDialog(text)
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-04-25 20:25:06 +0000
+++ debian/changelog	2013-04-26 09:49:28 +0000
@@ -3,6 +3,8 @@
   [ Brendan Donegan ]
   * Add hidden 'Submit to HEXR' checkbox on submission screen, so that it can
     be utilised in checkbox-certification.
+  * checkbox/user_interface.py - fixed keyword argument in show_entry.
+    checkbox_cli/cli_interface.py - return tuple as expected. (LP: #1173103)
 
   [ Po-Hsu Lin]
   * jobs/led.txt.in: Modified the description of led/power-blink-suspend test to