Philipp Hörist pushed to branch master at gajim / gajim
Commits:
c058a1e1 by André Apitzsch at 2017-04-10T23:48:52+02:00
zeroconf: string.letters has been removed with Python 3
use ascii_letters which should be sufficient
- - - - -
4725858a by André Apitzsch at 2017-04-10T23:53:54+02:00
zeroconf: 'to' is of type JID and no string
use a class method to remove the resource from JID
- - - - -
8e3e9b4d by Philipp Hörist at 2017-04-19T18:55:25+02:00
Merge branch 'zeroconf' into 'master'
fix python errors in client zeroconf
See merge request !82
- - - - -
1 changed file:
- src/common/zeroconf/client_zeroconf.py
Changes:
=====================================
src/common/zeroconf/client_zeroconf.py
=====================================
--- a/src/common/zeroconf/client_zeroconf.py
+++ b/src/common/zeroconf/client_zeroconf.py
@@ -756,7 +756,7 @@ class ClientZeroconf:
if to is None:
# Can’t send undirected stanza over Zeroconf.
return -1
- to = gajim.get_jid_without_resource(to)
+ to = to.getStripped()
stanza.setFrom(self.roster.zeroconf.name)
try:
@@ -801,7 +801,7 @@ class ClientZeroconf:
"""
Generate a random id
"""
- return ''.join(Random().sample(string.letters + string.digits, 6))
+ return ''.join(Random().sample(string.ascii_letters + string.digits,
6))
def RegisterDisconnectHandler(self, handler):
"""
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/14091642c4b5dd33ca280504366b4caacbe52dc9...8e3e9b4d9db1a50ce11f94adf4053ec78aad0ad6
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
