Merge branch 'zeroconf' into 'master'

fix python errors in client zeroconf

See merge request !82
This commit is contained in:
Philipp Hörist 2017-04-19 18:55:25 +02:00
commit 8e3e9b4d9d
1 changed files with 2 additions and 2 deletions

View File

@ -756,7 +756,7 @@ class ClientZeroconf:
if to is None: if to is None:
# Cant send undirected stanza over Zeroconf. # Cant send undirected stanza over Zeroconf.
return -1 return -1
to = gajim.get_jid_without_resource(to) to = to.getStripped()
stanza.setFrom(self.roster.zeroconf.name) stanza.setFrom(self.roster.zeroconf.name)
try: try:
@ -801,7 +801,7 @@ class ClientZeroconf:
""" """
Generate a random id 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): def RegisterDisconnectHandler(self, handler):
""" """