summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--slixmpp/plugins/xep_0009/remote.py4
-rw-r--r--slixmpp/plugins/xep_0030/static.py2
-rw-r--r--slixmpp/plugins/xep_0050/adhoc.py2
-rw-r--r--slixmpp/plugins/xep_0059/rsm.py2
-rw-r--r--slixmpp/plugins/xep_0059/stanza.py2
-rw-r--r--slixmpp/plugins/xep_0060/stanza/pubsub.py6
-rw-r--r--slixmpp/plugins/xep_0060/stanza/pubsub_event.py6
-rw-r--r--slixmpp/plugins/xep_0065/proxy.py2
-rw-r--r--slixmpp/plugins/xep_0199/ping.py2
-rw-r--r--slixmpp/plugins/xep_0300/hash.py4
-rw-r--r--slixmpp/plugins/xep_0325/control.py4
-rw-r--r--slixmpp/stanza/roster.py4
-rw-r--r--slixmpp/xmlstream/matcher/xmlmask.py2
-rw-r--r--slixmpp/xmlstream/resolver.py2
-rw-r--r--slixmpp/xmlstream/xmlstream.py4
15 files changed, 24 insertions, 24 deletions
diff --git a/slixmpp/plugins/xep_0009/remote.py b/slixmpp/plugins/xep_0009/remote.py
index a9f45486..6fa85cc7 100644
--- a/slixmpp/plugins/xep_0009/remote.py
+++ b/slixmpp/plugins/xep_0009/remote.py
@@ -61,7 +61,7 @@ def _intercept(method, name, public):
except InvocationException:
raise
except Exception as e:
- raise InvocationException("A problem occured calling %s.%s!" % (instance.FQN(), method.__name__), e)
+ raise InvocationException("A problem occurred calling %s.%s!" % (instance.FQN(), method.__name__), e)
_resolver._rpc = public
_resolver._rpc_name = method.__name__ if name is None else name
return _resolver
@@ -696,7 +696,7 @@ class RemoteSession(object):
e = {
'item-not-found': RemoteException("No remote handler available for %s at %s!" % (pmethod, iq['from'])),
'forbidden': AuthorizationException("Forbidden to invoke remote handler for %s at %s!" % (pmethod, iq['from'])),
- 'undefined-condition': RemoteException("An unexpected problem occured trying to invoke %s at %s!" % (pmethod, iq['from'])),
+ 'undefined-condition': RemoteException("An unexpected problem occurred trying to invoke %s at %s!" % (pmethod, iq['from'])),
}[condition]
if e is None:
RemoteException("An unexpected exception occurred at %s!" % iq['from'])
diff --git a/slixmpp/plugins/xep_0030/static.py b/slixmpp/plugins/xep_0030/static.py
index 5ff7afb5..559c8f14 100644
--- a/slixmpp/plugins/xep_0030/static.py
+++ b/slixmpp/plugins/xep_0030/static.py
@@ -257,7 +257,7 @@ class StaticDisco(object):
def add_identity(self, jid, node, ifrom, data):
"""
- Add a new identity to te JID/node combination.
+ Add a new identity to the JID/node combination.
The data parameter may provide:
category -- The general category to which the agent belongs.
diff --git a/slixmpp/plugins/xep_0050/adhoc.py b/slixmpp/plugins/xep_0050/adhoc.py
index 4cff6b46..9874165d 100644
--- a/slixmpp/plugins/xep_0050/adhoc.py
+++ b/slixmpp/plugins/xep_0050/adhoc.py
@@ -611,7 +611,7 @@ class XEP_0050(BasePlugin):
def terminate_command(self, session):
"""
Delete a command's session after a command has completed
- or an error has occured.
+ or an error has occurred.
Arguments:
session -- All stored data relevant to the current
diff --git a/slixmpp/plugins/xep_0059/rsm.py b/slixmpp/plugins/xep_0059/rsm.py
index 8f7f48f0..a8eeea60 100644
--- a/slixmpp/plugins/xep_0059/rsm.py
+++ b/slixmpp/plugins/xep_0059/rsm.py
@@ -22,7 +22,7 @@ log = logging.getLogger(__name__)
class ResultIterator:
"""
- An iterator for Result Set Managment
+ An iterator for Result Set Management
"""
def __init__(self, query, interface, results='substanzas', amount=10,
diff --git a/slixmpp/plugins/xep_0059/stanza.py b/slixmpp/plugins/xep_0059/stanza.py
index 38ac08b8..b74ac1e8 100644
--- a/slixmpp/plugins/xep_0059/stanza.py
+++ b/slixmpp/plugins/xep_0059/stanza.py
@@ -13,7 +13,7 @@ from slixmpp.plugins.xep_0030.stanza.items import DiscoItems
class Set(ElementBase):
"""
- XEP-0059 (Result Set Managment) can be used to manage the
+ XEP-0059 (Result Set Management) can be used to manage the
results of queries. For example, limiting the number of items
per response or starting at certain positions.
diff --git a/slixmpp/plugins/xep_0060/stanza/pubsub.py b/slixmpp/plugins/xep_0060/stanza/pubsub.py
index 210bce08..642d7963 100644
--- a/slixmpp/plugins/xep_0060/stanza/pubsub.py
+++ b/slixmpp/plugins/xep_0060/stanza/pubsub.py
@@ -82,9 +82,9 @@ class Item(ElementBase):
self.xml.append(value)
def get_payload(self):
- childs = list(self.xml)
- if len(childs) > 0:
- return childs[0]
+ children = list(self.xml)
+ if len(children) > 0:
+ return children[0]
def del_payload(self):
for child in self.xml:
diff --git a/slixmpp/plugins/xep_0060/stanza/pubsub_event.py b/slixmpp/plugins/xep_0060/stanza/pubsub_event.py
index e46ad408..81ed1917 100644
--- a/slixmpp/plugins/xep_0060/stanza/pubsub_event.py
+++ b/slixmpp/plugins/xep_0060/stanza/pubsub_event.py
@@ -31,9 +31,9 @@ class EventItem(ElementBase):
self.xml.append(value)
def get_payload(self):
- childs = list(self.xml)
- if len(childs) > 0:
- return childs[0]
+ children = list(self.xml)
+ if len(children) > 0:
+ return children[0]
def del_payload(self):
for child in self.xml:
diff --git a/slixmpp/plugins/xep_0065/proxy.py b/slixmpp/plugins/xep_0065/proxy.py
index 3fe6d2d1..cda33dca 100644
--- a/slixmpp/plugins/xep_0065/proxy.py
+++ b/slixmpp/plugins/xep_0065/proxy.py
@@ -233,7 +233,7 @@ class XEP_0065(BasePlugin):
sock.close()
except socket.error:
pass
- # Though this should not be neccessary remove the closed session anyway
+ # Though this should not be necessary remove the closed session anyway
if sid in self._sessions:
log.warn(('SOCKS5 session with sid = "%s" was not ' +
'removed from _sessions by sock.close()') % sid)
diff --git a/slixmpp/plugins/xep_0199/ping.py b/slixmpp/plugins/xep_0199/ping.py
index 9bd595a4..2ca71f7d 100644
--- a/slixmpp/plugins/xep_0199/ping.py
+++ b/slixmpp/plugins/xep_0199/ping.py
@@ -110,7 +110,7 @@ class XEP_0199(BasePlugin):
try:
rtt = yield from self.ping(self.xmpp.boundjid.host, timeout=self.timeout)
except IqTimeout:
- log.debug("Did not recieve ping back in time." + \
+ log.debug("Did not receive ping back in time." + \
"Requesting Reconnect.")
self.xmpp.reconnect()
else:
diff --git a/slixmpp/plugins/xep_0300/hash.py b/slixmpp/plugins/xep_0300/hash.py
index 43dcb5bd..6095671d 100644
--- a/slixmpp/plugins/xep_0300/hash.py
+++ b/slixmpp/plugins/xep_0300/hash.py
@@ -25,7 +25,7 @@ class XEP_0300(BasePlugin):
stanza = stanza
default_config = {
'block_size': 1024 * 1024, # One MiB
- 'prefered': 'sha-256',
+ 'preferded': 'sha-256',
'enable_sha-1': False,
'enable_sha-256': True,
'enable_sha-512': True,
@@ -73,7 +73,7 @@ class XEP_0300(BasePlugin):
def compute_hash(self, filename, function=None):
if function is None:
- function = self.prefered
+ function = self.preferred
h = self._hashlib_function[function]()
with open(filename, 'rb') as f:
while True:
diff --git a/slixmpp/plugins/xep_0325/control.py b/slixmpp/plugins/xep_0325/control.py
index 5960291c..00f6dee4 100644
--- a/slixmpp/plugins/xep_0325/control.py
+++ b/slixmpp/plugins/xep_0325/control.py
@@ -399,7 +399,7 @@ class XEP_0325(BasePlugin):
"""
if not session in self.sessions:
- # This can happend if a session was deleted, like in a timeout. Just drop the data.
+ # This can happen if a session was deleted, like in a timeout. Just drop the data.
return
if result == "error":
@@ -457,7 +457,7 @@ class XEP_0325(BasePlugin):
Arguments:
from_jid -- The jid of the requester
to_jid -- The jid of the device(s)
- callback -- The callback function to call when data is availble.
+ callback -- The callback function to call when data is available.
The callback function must support the following arguments:
diff --git a/slixmpp/stanza/roster.py b/slixmpp/stanza/roster.py
index 11d38cc2..b028e432 100644
--- a/slixmpp/stanza/roster.py
+++ b/slixmpp/stanza/roster.py
@@ -40,7 +40,7 @@ class Roster(ElementBase):
def get_ver(self):
"""
- Ensure handling an empty ver attribute propery.
+ Ensure handling an empty ver attribute property.
The ver attribute is special in that the presence of the
attribute with an empty value is important for boostrapping
@@ -50,7 +50,7 @@ class Roster(ElementBase):
def set_ver(self, ver):
"""
- Ensure handling an empty ver attribute propery.
+ Ensure handling an empty ver attribute property.
The ver attribute is special in that the presence of the
attribute with an empty value is important for boostrapping
diff --git a/slixmpp/xmlstream/matcher/xmlmask.py b/slixmpp/xmlstream/matcher/xmlmask.py
index 7e26abe2..343bb340 100644
--- a/slixmpp/xmlstream/matcher/xmlmask.py
+++ b/slixmpp/xmlstream/matcher/xmlmask.py
@@ -75,7 +75,7 @@ class MatchXMLMask(MatcherBase):
Defaults to ``"__no_ns__"``.
"""
if source is None:
- # If the element was not found. May happend during recursive calls.
+ # If the element was not found. May happen during recursive calls.
return False
# Convert the mask to an XML object if it is a string.
diff --git a/slixmpp/xmlstream/resolver.py b/slixmpp/xmlstream/resolver.py
index 56cf3872..23f7f039 100644
--- a/slixmpp/xmlstream/resolver.py
+++ b/slixmpp/xmlstream/resolver.py
@@ -229,7 +229,7 @@ def get_AAAA(host, resolver=None, use_aiodns=True, loop=None):
type=socket.SOCK_STREAM)
return [rec[4][0] for rec in recs]
except (OSError, socket.gaierror):
- log.debug("DNS: Error retreiving AAAA address " + \
+ log.debug("DNS: Error retrieving AAAA address " + \
"info for %s." % host)
return []
diff --git a/slixmpp/xmlstream/xmlstream.py b/slixmpp/xmlstream/xmlstream.py
index f7c0dea0..2ab9a352 100644
--- a/slixmpp/xmlstream/xmlstream.py
+++ b/slixmpp/xmlstream/xmlstream.py
@@ -436,7 +436,7 @@ class XMLStream(asyncio.BaseProtocol):
def cancel_connection_attempt(self):
"""
- Immediatly cancel the current create_connection() Future.
+ Immediately cancel the current create_connection() Future.
This is useful when a client using slixmpp tries to connect
on flaky networks, where sometimes a connection just gets lost
and it needs to reconnect while the attempt is still ongoing.
@@ -449,7 +449,7 @@ class XMLStream(asyncio.BaseProtocol):
"""Close the XML stream and wait for an acknowldgement from the server for
at most `wait` seconds. After the given number of seconds has
passed without a response from the serveur, or when the server
- successfuly responds with a closure of its own stream, abort() is
+ successfully responds with a closure of its own stream, abort() is
called. If wait is 0.0, this is almost equivalent to calling abort()
directly.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 07:38:06 +0000