Merge lp:~mardy/account-plugins/python3 into lp:account-plugins

[Alberto Mardegan]

Port to python3

Patch by Ken Vandine.

[David King (amigadave)]

Works fine.

review: Approve

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:62
http://s-jenkins:8080/job/online-accounts-account-plugins-ci/6/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/online-accounts-account-plugins-ci/./label=precise-clean-i386/6/console

review: Approve (continuous-integration)

=== modified file 'tools/account-console'
--- tools/account-console	2012-07-23 06:14:53 +0000
+++ tools/account-console	2012-08-29 08:02:22 +0000
@@ -1,9 +1,9 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 
 import argparse
-import glib
 import sys
 
+from gi.repository import GLib
 from gi.repository import GObject
 from gi.repository import Accounts
 from gi.repository import Signon
@@ -18,14 +18,14 @@
     def list_accounts(self, args):
         accounts = self.manager.list()
         if not accounts:
-            print 'No accounts'
+            print('No accounts')
             main_loop.quit()
             return
 
         for account_id in accounts:
             account = self.manager.get_account(account_id)
             enabledness = 'enabled' if account.get_enabled() else 'disabled'
-            print 'account: id %s, %s, provider: %s' % (account_id, enabledness, account.get_provider_name())
+            print('account: id %s, %s, provider: %s' % (account_id, enabledness, account.get_provider_name()))
         main_loop.quit()
 
 
@@ -37,8 +37,8 @@
             sys.exit(1)
 
         enabledness = 'enabled' if account.get_enabled() else 'disabled'
-        print 'account: id %s, %s, provider: %s' % (account.id, enabledness, account.get_provider_name())
-        print '  Global settings:'
+        print('account: id %s, %s, provider: %s' % (account.id, enabledness, account.get_provider_name()))
+        print('  Global settings:')
         i = account.get_settings_iter(None)
         self.enumerate_settings(i)
 
@@ -46,7 +46,7 @@
         services = account.list_services()
         for s in services:
             service = Accounts.AccountService.new(account, s)
-            print '  Settings for %s' % (s.get_name(),)
+            print('  Settings for %s' % (s.get_name(),))
             i = service.get_settings_iter(None)
             self.enumerate_settings(i)
         main_loop.quit()
@@ -124,7 +124,7 @@
 
 
     def on_credentials_stored(self, identity, id, error, account):
-        print 'On credentials stored', id
+        print('On credentials stored', id)
         account.set_value(self.args.signon_id_field, int(id))
         account.store(self.on_account_stored, None)
 
@@ -186,7 +186,7 @@
         else:
             self.session = Signon.AuthSession.new(0, method)
 
-        print session_data
+        print(session_data)
         self.session.process(session_data, mechanism,
                 self.login_process_cb, None)
 
@@ -216,13 +216,13 @@
             print >> sys.stderr, 'Got authentication error:', error.message
             sys.exit(1)
 
-        print 'Got reply: ', reply
+        print('Got reply: ', reply)
         main_loop.quit()
 
 
     def on_account_stored_deleted(self, account, error, userdata):
         if not error:
-            print 'OK'
+            print('OK')
         else:
             print >> sys.stderr, 'Error occurred: ', error.message
         main_loop.quit()
@@ -230,9 +230,9 @@
     def on_account_stored(self, account, error, userdata):
         if not error:
             if 'print_id' in self.args and self.args.print_id:
-                print '%s' % (account.id)
+                print('%s' % (account.id))
             else:
-                print 'OK %s' % (account.id)
+                print('OK %s' % (account.id))
         else:
             print >> sys.stderr, 'Error occurred: ', error.message
         main_loop.quit()
@@ -246,7 +246,7 @@
 
         settings.sort()
         for (key, value) in settings:
-            print '    %s: %s (%s)' % (key, value, type(value))
+            print('    %s: %s (%s)' % (key, value, type(value)))
 
     def parse_setting(self, setting):
         (name, value_str) = setting.split('=')
@@ -357,8 +357,8 @@
 
 args = parser.parse_args()
 
-main_loop = glib.MainLoop()
-glib.idle_add(args.func, args)
+main_loop = GLib.MainLoop()
+GLib.idle_add(args.func, args)
 
 main_loop.run()