Re: [PATCH v2 4/4] test: Update with RequestQuickDigit API

[Denis Kenzior <denkenz@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2321 bytes --]

Hi Philippe,

On 08/28/2012 08:21 AM, Philippe Nunes wrote:
> ---
>   test/test-stk-menu |   37 +++++++++++++++++++++++++++++++++++++
>   1 file changed, 37 insertions(+)
>

Applying: test: Update with RequestQuickDigit API
/home/denkenz/ofono-master/.git/rebase-apply/patch:45: trailing whitespace.
		print "Single key press (t, b, 0-9,*,#)"
/home/denkenz/ofono-master/.git/rebase-apply/patch:53: trailing whitespace.
			print "."			
fatal: 2 lines add whitespace errors.
Patch failed at 0001 test: Update with RequestQuickDigit API

> diff --git a/test/test-stk-menu b/test/test-stk-menu
> index a9f92e8..476d949 100755
> --- a/test/test-stk-menu
> +++ b/test/test-stk-menu
> @@ -7,6 +7,27 @@ import dbus
>   import dbus.service
>   import dbus.mainloop.glib
>
> +
> +

Why double empty line?

> +class _GetchUnix:
> +    def __init__(self):
> +        import tty, sys
> +
> +    def __call__(self):
> +        import sys, tty, termios
> +        fd = sys.stdin.fileno()
> +        old_settings = termios.tcgetattr(fd)
> +        try:
> +            tty.setraw(sys.stdin.fileno())
> +            ch = sys.stdin.read(1)
> +        finally:
> +            termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
> +        return ch
> +
> +
> +getch = _GetchUnix()
> +
> +

And again?

Also, are you sure we need to go this complicated.  We already ignore 
'hide_typing' elsewhere...

>   class GoBack(dbus.DBusException):
>   	_dbus_error_name = "org.ofono.Error.GoBack"
>
> @@ -127,6 +148,22 @@ class StkAgent(dbus.service.Object):
>   			return key
>
>   	@dbus.service.method("org.ofono.SimToolkitAgent",
> +				in_signature="sy", out_signature="s")
> +	def RequestQuickDigit(self, title, icon):
> +		print "Title: (%s)" % (title)
> +		print "Icon: (%d)" % (icon)
> +		print "Single key press (t, b, 0-9,*,#)"
> +		key = getch();
> +
> +		if key == 'b':
> +			raise GoBack("User wishes to go back");
> +		elif key == 't':
> +			raise EndSession("User wishes to terminate session");
> +		else:
> +			print "."			
> +			return key
> +
> +	@dbus.service.method("org.ofono.SimToolkitAgent",
>   				in_signature="sy", out_signature="b")
>   	def RequestConfirmation(self, title, icon):
>   		print "Title: (%s)" % (title)

Regards,
-Denis