Philipp Hörist pushed to branch master at gajim / python-nbxmpp
Commits:
91661540 by lovetox at 2021-11-03T23:49:32+01:00
Replace deprecated methods
- - - - -
0ac2a6a6 by lovetox at 2021-11-03T23:50:27+01:00
Remove unused methods
- - - - -
6 changed files:
- nbxmpp/modules/activity.py
- nbxmpp/modules/adhoc.py
- nbxmpp/modules/mood.py
- nbxmpp/modules/muc/muc.py
- nbxmpp/protocol.py
- nbxmpp/simplexml.py
Changes:
=====================================
nbxmpp/modules/activity.py
=====================================
@@ -70,7 +70,7 @@ class Activity(BaseModule):
activity = name
subactivity = self._parse_sub_activity(child)
- if activity is None and activity_node.getPayload():
+ if activity is None and activity_node.getChildren():
self._log.warning('No valid activity value found')
self._log.warning(stanza)
raise NodeProcessed
=====================================
nbxmpp/modules/adhoc.py
=====================================
@@ -49,12 +49,12 @@ class AdHoc(BaseModule):
if response.isError():
raise StanzaError(response)
- payload = response.getQueryPayload()
- if payload is None:
- raise MalformedStanzaError('query payload missing', response)
+ children = response.getQueryChildren()
+ if not children:
+ raise MalformedStanzaError('query children missing', response)
command_list = []
- for item in payload:
+ for item in children:
if item.getName() != 'item':
continue
try:
=====================================
nbxmpp/modules/mood.py
=====================================
@@ -68,7 +68,7 @@ class Mood(BaseModule):
elif name in MOODS:
mood = name
- if mood is None and mood_node.getPayload():
+ if mood is None and mood_node.getChildren():
self._log.warning('No valid mood value found')
self._log.warning(stanza)
raise NodeProcessed
=====================================
nbxmpp/modules/muc/muc.py
=====================================
@@ -437,9 +437,9 @@ class MUC(BaseModule):
raise StanzaError(response)
jid = response.getFrom()
- payload = response.getQueryPayload()
+ children = response.getQueryChildren()
- for form in payload:
+ for form in children:
if form.getNamespace() == Namespace.DATA:
dataform = extend_form(node=form)
self._log.info('Config form received for %s', jid)
=====================================
nbxmpp/protocol.py
=====================================
@@ -1444,15 +1444,6 @@ class Iq(Protocol):
return tag.getAttr('node')
return None
- def getQueryPayload(self) -> Optional[list[Union[Node, str]]]:
- """
- Return the 'query' child element payload
- """
- tag = self.getQuery()
- if tag:
- return tag.getPayload()
- return None
-
def getQueryChildren(self) -> Optional[list[Node]]:
"""
Return the 'query' child element child nodes
=====================================
nbxmpp/simplexml.py
=====================================
@@ -324,25 +324,6 @@ class Node:
"""
return self.parent
- def getPayload(self) -> List[Union[Node, str]]:
- """
- Return the payload of node i.e. list of child nodes and CDATA entries.
- F.e. for "<node>text1<nodea/><nodeb/> text2</node>" will be returned
- list: ['text1', <nodea instance>, <nodeb instance>, ' text2']
- """
- ret: List[Union[Node, str]] = []
- for i in range(len(self.kids)+len(self.data)+1):
- try:
- if self.data[i]:
- ret.append(self.data[i])
- except IndexError:
- pass
- try:
- ret.append(self.kids[i])
- except IndexError:
- pass
- return ret
-
def getTag(self,
name: str,
attrs: Optional[Attrs] = None,
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/-/compare/46ac9536d5023be5334fc7020c2c78a124085cd2...0ac2a6a67ceead4ff32afe96bba5d443b139b816
--
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/-/compare/46ac9536d5023be5334fc7020c2c78a124085cd2...0ac2a6a67ceead4ff32afe96bba5d443b139b816
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
