Merge branch 'more-typing' into 'master'

Add more typing

See merge request poezio/slixmpp!166

1 files changed, 9 insertions, 8 deletions

diff --git a/slixmpp/xmlstream/matcher/xpath.py b/slixmpp/xmlstream/matcher/xpath.py
index b7503b73..bd41b60a 100644
--- a/slixmpp/xmlstream/matcher/xpath.py
+++ b/slixmpp/xmlstream/matcher/xpath.py
@@ -4,7 +4,8 @@
 # Part of Slixmpp: The Slick XMPP Library
 # :copyright: (c) 2011 Nathanael C. Fritz
 # :license: MIT, see LICENSE for more details
-from slixmpp.xmlstream.stanzabase import ET, fix_ns
+from typing import cast
+from slixmpp.xmlstream.stanzabase import ET, fix_ns, StanzaBase
 from slixmpp.xmlstream.matcher.base import MatcherBase
 
 
@@ -17,23 +18,23 @@ class MatchXPath(MatcherBase):
     If the value of :data:`IGNORE_NS` is set to ``True``, then XPath
     expressions will be matched without using namespaces.
     """
+    _criteria: str
 
-    def __init__(self, criteria):
-        self._criteria = fix_ns(criteria)
+    def __init__(self, criteria: str):
+        self._criteria = cast(str, fix_ns(criteria))
 
-    def match(self, xml):
+    def match(self, xml: StanzaBase) -> bool:
         """
         Compare a stanza's XML contents to an XPath expression.
 
         If the value of :data:`IGNORE_NS` is set to ``True``, then XPath
         expressions will be matched without using namespaces.
 
-        :param xml: The :class:`~slixmpp.xmlstream.stanzabase.ElementBase`
+        :param xml: The :class:`~slixmpp.xmlstream.stanzabase.StanzaBase`
                     stanza to compare against.
         """
-        if hasattr(xml, 'xml'):
-            xml = xml.xml
+        real_xml = xml.xml
         x = ET.Element('x')
-        x.append(xml)
+        x.append(real_xml)
 
         return x.find(self._criteria) is not None