[PATCH BlueZ] test/example-advertisement: add python3 support

[PATCH BlueZ] test/example-advertisement: add python3 support

[Hunt, Preston]

VGhpcyBhZGRzIHN1cHBvcnQgZm9yIHB5dGhvbjMgdG8gdGhlIGV4aXN0aW5nIHNjcmlwdC4gVGhl
IHNjcmlwdCB3aWxsDQpub3cgd29yayB3aXRoIGVpdGhlciBweXRob24yIG9yIHB5dGhvbjMuDQot
LS0NCiB0ZXN0L2V4YW1wbGUtYWR2ZXJ0aXNlbWVudCB8IDI0ICsrKysrKysrKysrKysrKy0tLS0t
LS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQ0K
DQpkaWZmIC0tZ2l0IGEvdGVzdC9leGFtcGxlLWFkdmVydGlzZW1lbnQgYi90ZXN0L2V4YW1wbGUt
YWR2ZXJ0aXNlbWVudA0KaW5kZXggZDliNWI0Mi4uZmQ4NGVhYyAxMDA3NTUNCi0tLSBhL3Rlc3Qv
ZXhhbXBsZS1hZHZlcnRpc2VtZW50DQorKysgYi90ZXN0L2V4YW1wbGUtYWR2ZXJ0aXNlbWVudA0K
QEAgLTEsMTIgKzEsMTggQEANCiAjIS91c3IvYmluL3B5dGhvbg0KIA0KK2Zyb20gX19mdXR1cmVf
XyBpbXBvcnQgcHJpbnRfZnVuY3Rpb24NCisNCiBpbXBvcnQgZGJ1cw0KIGltcG9ydCBkYnVzLmV4
Y2VwdGlvbnMNCiBpbXBvcnQgZGJ1cy5tYWlubG9vcC5nbGliDQogaW1wb3J0IGRidXMuc2Vydmlj
ZQ0KIA0KIGltcG9ydCBhcnJheQ0KLWltcG9ydCBnb2JqZWN0DQorDQordHJ5Og0KKyAgZnJvbSBn
aS5yZXBvc2l0b3J5IGltcG9ydCBHT2JqZWN0ICAjIHB5dGhvbjMNCitleGNlcHQgSW1wb3J0RXJy
b3I6DQorICBpbXBvcnQgZ29iamVjdCBhcyBHT2JqZWN0ICAjIHB5dGhvbjINCiANCiBmcm9tIHJh
bmRvbSBpbXBvcnQgcmFuZGludA0KIA0KQEAgLTExOCwxNyArMTI0LDE3IEBAIGNsYXNzIEFkdmVy
dGlzZW1lbnQoZGJ1cy5zZXJ2aWNlLk9iamVjdCk6DQogICAgICAgICAgICAgICAgICAgICAgICAg
IGluX3NpZ25hdHVyZT0ncycsDQogICAgICAgICAgICAgICAgICAgICAgICAgIG91dF9zaWduYXR1
cmU9J2F7c3Z9JykNCiAgICAgZGVmIEdldEFsbChzZWxmLCBpbnRlcmZhY2UpOg0KLSAgICAgICAg
cHJpbnQgJ0dldEFsbCcNCisgICAgICAgIHByaW50KCdHZXRBbGwnKQ0KICAgICAgICAgaWYgaW50
ZXJmYWNlICE9IExFX0FEVkVSVElTRU1FTlRfSUZBQ0U6DQogICAgICAgICAgICAgcmFpc2UgSW52
YWxpZEFyZ3NFeGNlcHRpb24oKQ0KLSAgICAgICAgcHJpbnQgJ3JldHVybmluZyBwcm9wcycNCisg
ICAgICAgIHByaW50KCdyZXR1cm5pbmcgcHJvcHMnKQ0KICAgICAgICAgcmV0dXJuIHNlbGYuZ2V0
X3Byb3BlcnRpZXMoKVtMRV9BRFZFUlRJU0VNRU5UX0lGQUNFXQ0KIA0KICAgICBAZGJ1cy5zZXJ2
aWNlLm1ldGhvZChMRV9BRFZFUlRJU0VNRU5UX0lGQUNFLA0KICAgICAgICAgICAgICAgICAgICAg
ICAgICBpbl9zaWduYXR1cmU9JycsDQogICAgICAgICAgICAgICAgICAgICAgICAgIG91dF9zaWdu
YXR1cmU9JycpDQogICAgIGRlZiBSZWxlYXNlKHNlbGYpOg0KLSAgICAgICAgcHJpbnQgJyVzOiBS
ZWxlYXNlZCEnICUgc2VsZi5wYXRoDQorICAgICAgICBwcmludCgnJXM6IFJlbGVhc2VkIScgJSBz
ZWxmLnBhdGgpDQogDQogY2xhc3MgVGVzdEFkdmVydGlzZW1lbnQoQWR2ZXJ0aXNlbWVudCk6DQog
DQpAQCAtMTQ0LDExICsxNTAsMTEgQEAgY2xhc3MgVGVzdEFkdmVydGlzZW1lbnQoQWR2ZXJ0aXNl
bWVudCk6DQogDQogDQogZGVmIHJlZ2lzdGVyX2FkX2NiKCk6DQotICAgIHByaW50ICdBZHZlcnRp
c2VtZW50IHJlZ2lzdGVyZWQnDQorICAgIHByaW50KCdBZHZlcnRpc2VtZW50IHJlZ2lzdGVyZWQn
KQ0KIA0KIA0KIGRlZiByZWdpc3Rlcl9hZF9lcnJvcl9jYihlcnJvcik6DQotICAgIHByaW50ICdG
YWlsZWQgdG8gcmVnaXN0ZXIgYWR2ZXJ0aXNlbWVudDogJyArIHN0cihlcnJvcikNCisgICAgcHJp
bnQoJ0ZhaWxlZCB0byByZWdpc3RlciBhZHZlcnRpc2VtZW50OiAnICsgc3RyKGVycm9yKSkNCiAg
ICAgbWFpbmxvb3AucXVpdCgpDQogDQogDQpAQCAtMTU3LDcgKzE2Myw3IEBAIGRlZiBmaW5kX2Fk
YXB0ZXIoYnVzKToNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgREJVU19PTV9JRkFD
RSkNCiAgICAgb2JqZWN0cyA9IHJlbW90ZV9vbS5HZXRNYW5hZ2VkT2JqZWN0cygpDQogDQotICAg
IGZvciBvLCBwcm9wcyBpbiBvYmplY3RzLml0ZXJpdGVtcygpOg0KKyAgICBmb3IgbywgcHJvcHMg
aW4gb2JqZWN0cy5pdGVtcygpOg0KICAgICAgICAgaWYgTEVfQURWRVJUSVNJTkdfTUFOQUdFUl9J
RkFDRSBpbiBwcm9wczoNCiAgICAgICAgICAgICByZXR1cm4gbw0KIA0KQEAgLTE3Myw3ICsxNzks
NyBAQCBkZWYgbWFpbigpOg0KIA0KICAgICBhZGFwdGVyID0gZmluZF9hZGFwdGVyKGJ1cykNCiAg
ICAgaWYgbm90IGFkYXB0ZXI6DQotICAgICAgICBwcmludCAnTEVBZHZlcnRpc2luZ01hbmFnZXIx
IGludGVyZmFjZSBub3QgZm91bmQnDQorICAgICAgICBwcmludCgnTEVBZHZlcnRpc2luZ01hbmFn
ZXIxIGludGVyZmFjZSBub3QgZm91bmQnKQ0KICAgICAgICAgcmV0dXJuDQogDQogICAgIGFkYXB0
ZXJfcHJvcHMgPSBkYnVzLkludGVyZmFjZShidXMuZ2V0X29iamVjdChCTFVFWl9TRVJWSUNFX05B
TUUsIGFkYXB0ZXIpLA0KQEAgLTE4Niw3ICsxOTIsNyBAQCBkZWYgbWFpbigpOg0KIA0KICAgICB0
ZXN0X2FkdmVydGlzZW1lbnQgPSBUZXN0QWR2ZXJ0aXNlbWVudChidXMsIDApDQogDQotICAgIG1h
aW5sb29wID0gZ29iamVjdC5NYWluTG9vcCgpDQorICAgIG1haW5sb29wID0gR09iamVjdC5NYWlu
TG9vcCgpDQogDQogICAgIGFkX21hbmFnZXIuUmVnaXN0ZXJBZHZlcnRpc2VtZW50KHRlc3RfYWR2
ZXJ0aXNlbWVudC5nZXRfcGF0aCgpLCB7fSwNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgcmVwbHlfaGFuZGxlcj1yZWdpc3Rlcl9hZF9jYiwNCi0tIA0KMi43LjQNCg0KDQo=

Re: [PATCH BlueZ] test/example-advertisement: add python3 support

[Luiz Augusto von Dentz]

Hi Preston,
On Fri, May 4, 2018 at 6:01 PM Hunt, Preston <preston.hunt@intel.com> wrote:

> This adds support for python3 to the existing script. The script will
> now work with either python2 or python3.
> ---
>   test/example-advertisement | 24 +++++++++++++++---------
>   1 file changed, 15 insertions(+), 9 deletions(-)

> diff --git a/test/example-advertisement b/test/example-advertisement
> index d9b5b42..fd84eac 100755
> --- a/test/example-advertisement
> +++ b/test/example-advertisement
> @@ -1,12 +1,18 @@
>   #!/usr/bin/python

> +from __future__ import print_function
> +
>   import dbus
>   import dbus.exceptions
>   import dbus.mainloop.glib
>   import dbus.service

>   import array
> -import gobject
> +
> +try:
> +  from gi.repository import GObject  # python3
> +except ImportError:
> +  import gobject as GObject  # python2

>   from random import randint

> @@ -118,17 +124,17 @@ class Advertisement(dbus.service.Object):
>                            in_signature='s',
>                            out_signature='a{sv}')
>       def GetAll(self, interface):
> -        print 'GetAll'
> +        print('GetAll')
>           if interface != LE_ADVERTISEMENT_IFACE:
>               raise InvalidArgsException()
> -        print 'returning props'
> +        print('returning props')
>           return self.get_properties()[LE_ADVERTISEMENT_IFACE]

>       @dbus.service.method(LE_ADVERTISEMENT_IFACE,
>                            in_signature='',
>                            out_signature='')
>       def Release(self):
> -        print '%s: Released!' % self.path
> +        print('%s: Released!' % self.path)

>   class TestAdvertisement(Advertisement):

> @@ -144,11 +150,11 @@ class TestAdvertisement(Advertisement):


>   def register_ad_cb():
> -    print 'Advertisement registered'
> +    print('Advertisement registered')


>   def register_ad_error_cb(error):
> -    print 'Failed to register advertisement: ' + str(error)
> +    print('Failed to register advertisement: ' + str(error))
>       mainloop.quit()


> @@ -157,7 +163,7 @@ def find_adapter(bus):
>                                  DBUS_OM_IFACE)
>       objects = remote_om.GetManagedObjects()

> -    for o, props in objects.iteritems():
> +    for o, props in objects.items():
>           if LE_ADVERTISING_MANAGER_IFACE in props:
>               return o

> @@ -173,7 +179,7 @@ def main():

>       adapter = find_adapter(bus)
>       if not adapter:
> -        print 'LEAdvertisingManager1 interface not found'
> +        print('LEAdvertisingManager1 interface not found')
>           return

>       adapter_props = dbus.Interface(bus.get_object(BLUEZ_SERVICE_NAME,
adapter),
> @@ -186,7 +192,7 @@ def main():

>       test_advertisement = TestAdvertisement(bus, 0)

> -    mainloop = gobject.MainLoop()
> +    mainloop = GObject.MainLoop()

>       ad_manager.RegisterAdvertisement(test_advertisement.get_path(), {},
>                                        reply_handler=register_ad_cb,
> --
> 2.7.4

Applied, thanks.


-- 
Luiz Augusto von Dentz