Mercurial > libervia-backend
diff sat_frontends/quick_frontend/quick_contact_management.py @ 3028:ab2696e34d29
Python 3 port:
/!\ this is a huge commit
/!\ starting from this commit, SàT is needs Python 3.6+
/!\ SàT maybe be instable or some feature may not work anymore, this will improve with time
This patch port backend, bridge and frontends to Python 3.
Roughly this has been done this way:
- 2to3 tools has been applied (with python 3.7)
- all references to python2 have been replaced with python3 (notably shebangs)
- fixed files not handled by 2to3 (notably the shell script)
- several manual fixes
- fixed issues reported by Python 3 that where not handled in Python 2
- replaced "async" with "async_" when needed (it's a reserved word from Python 3.7)
- replaced zope's "implements" with @implementer decorator
- temporary hack to handle data pickled in database, as str or bytes may be returned,
to be checked later
- fixed hash comparison for password
- removed some code which is not needed anymore with Python 3
- deactivated some code which needs to be checked (notably certificate validation)
- tested with jp, fixed reported issues until some basic commands worked
- ported Primitivus (after porting dependencies like urwid satext)
- more manual fixes
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Tue, 13 Aug 2019 19:08:41 +0200 |
| parents | 003b8b4b56a7 |
| children | 9d0df638c8b4 |
line wrap: on
line diff
--- a/sat_frontends/quick_frontend/quick_contact_management.py Wed Jul 31 11:31:22 2019 +0200 +++ b/sat_frontends/quick_frontend/quick_contact_management.py Tue Aug 13 19:08:41 2019 +0200 @@ -41,7 +41,7 @@ def add(self, entity): """Add contact to the list, update resources""" - if not self.__contactlist.has_key(entity.bare): + if entity.bare not in self.__contactlist: self.__contactlist[entity.bare] = {"resources": []} if not entity.resource: return @@ -53,7 +53,7 @@ """Return all contacts which are in given group""" result = [] for contact in self.__contactlist: - if self.__contactlist[contact].has_key("groups"): + if "groups" in self.__contactlist[contact]: if group in self.__contactlist[contact]["groups"]: result.append(JID(contact)) return result @@ -63,11 +63,11 @@ @param entity: jid of the contact @param name: name of the attribute @return: asked attribute""" - if self.__contactlist.has_key(entity.bare): + if entity.bare in self.__contactlist: if name == "status": # FIXME: for the moment, we only use the first status if self.__contactlist[entity.bare]["statuses"]: - return self.__contactlist[entity.bare]["statuses"].values()[0] - if self.__contactlist[entity.bare].has_key(name): + return list(self.__contactlist[entity.bare]["statuses"].values())[0] + if name in self.__contactlist[entity.bare]: return self.__contactlist[entity.bare][name] else: log.debug(_("Trying to get attribute for an unknown contact")) @@ -75,7 +75,7 @@ def isConnected(self, entity): """Tell if the contact is online""" - return self.__contactlist.has_key(entity.bare) + return entity.bare in self.__contactlist def remove(self, entity): """remove resource. If no more resource is online or is no resource is specified, contact is deleted""" @@ -95,7 +95,7 @@ @param key: name of the attribute @param value: value of the attribute """ - if self.__contactlist.has_key(entity.bare): + if entity.bare in self.__contactlist: self.__contactlist[entity.bare][key] = value else: log.debug(_("Trying to update an unknown contact: %s") % entity.bare)