Mercurial > libervia-desktop
diff cagou/core/profile_manager.py @ 312:772c170b47a9
Python3 port:
/!\ Cagou now runs with Python 3.6+
Port has been done in the same way as for backend (check backend commit b2d067339de3
message for details).
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Tue, 13 Aug 2019 19:14:22 +0200 |
| parents | b2727877bad4 |
| children | 4d660b252487 |
line wrap: on
line diff
--- a/cagou/core/profile_manager.py Mon Aug 05 11:21:54 2019 +0200 +++ b/cagou/core/profile_manager.py Tue Aug 13 19:14:22 2019 +0200 @@ -42,12 +42,12 @@ error_msg = properties.StringProperty('') def __init__(self, pm): - super(NewProfileScreen, self).__init__(name=u'new_profile') + super(NewProfileScreen, self).__init__(name='new_profile') self.pm = pm def onCreationFailure(self, failure): - msg = [l for l in unicode(failure).split('\n') if l][-1] - self.error_msg = unicode(msg) + msg = [l for l in str(failure).split('\n') if l][-1] + self.error_msg = str(msg) def onCreationSuccess(self, profile): self.pm.profiles_screen.reload() @@ -68,7 +68,7 @@ # XXX: we use XMPP password for profile password to simplify # if user want to change profile password, he can do it in preferences G.host.bridge.profileCreate( - name, self.password.text, u'', + name, self.password.text, '', callback=lambda: self.onCreationSuccess(name), errback=self.onCreationFailure) @@ -77,7 +77,7 @@ def __init__(self, pm): self.pm = pm - super(DeleteProfilesScreen, self).__init__(name=u'delete_profiles') + super(DeleteProfilesScreen, self).__init__(name='delete_profiles') def doDelete(self): """This method will delete *ALL* selected profiles""" @@ -92,7 +92,7 @@ self.pm.screen_manager.current = 'profiles' for profile in to_delete: - log.info(u"Deleteing profile [{}]".format(profile)) + log.info("Deleteing profile [{}]".format(profile)) G.host.bridge.asyncDeleteProfile( profile, callback=deleteInc, errback=deleteInc) @@ -103,7 +103,7 @@ def __init__(self, pm): self.pm = pm - super(ProfilesScreen, self).__init__(name=u'profiles') + super(ProfilesScreen, self).__init__(name='profiles') self.reload() def _profilesListGetCb(self, profiles): @@ -134,7 +134,7 @@ self.profiles_screen = ProfilesScreen(self) self.new_profile_screen = NewProfileScreen(self) self.delete_profiles_screen = DeleteProfilesScreen(self) - self.xmlui_screen = Screen(name=u'xmlui') + self.xmlui_screen = Screen(name='xmlui') self.screen_manager.add_widget(self.profiles_screen) self.screen_manager.add_widget(self.xmlui_screen) self.screen_manager.add_widget(self.new_profile_screen)