Philipp Hörist pushed to branch master at gajim / python-nbxmpp
Commits:
2 changed files:
Changes:
| ... | ... | @@ -280,9 +280,6 @@ class Client(Observable): |
| 280 | 280 |
def mechs(self):
|
| 281 | 281 |
return set(self._allowed_mechs or set(['SCRAM-SHA-256',
|
| 282 | 282 |
'SCRAM-SHA-1',
|
| 283 |
- 'GSSAPI',
|
|
| 284 |
- # 'SCRAM-SHA-256-PLUS',
|
|
| 285 |
- # 'SCRAM-SHA-1-PLUS',
|
|
| 286 | 283 |
'PLAIN']))
|
| 287 | 284 |
|
| 288 | 285 |
def set_mechs(self, mechs):
|
| ... | ... | @@ -1344,7 +1344,7 @@ class Presence(Protocol): |
| 1344 | 1344 |
"""
|
| 1345 | 1345 |
Return the status string of the message
|
| 1346 | 1346 |
"""
|
| 1347 |
- return self.getTagData('status')
|
|
| 1347 |
+ return self.getTagData('status') or ''
|
|
| 1348 | 1348 |
|
| 1349 | 1349 |
def setPriority(self, val):
|
| 1350 | 1350 |
"""
|