diff --git a/examples/adhoc_provider.py b/examples/adhoc_provider.py index 0a7905b8..4d4c3610 100755 --- a/examples/adhoc_provider.py +++ b/examples/adhoc_provider.py @@ -192,14 +192,14 @@ if __name__ == '__main__': # Connect to the XMPP server and start processing XMPP stanzas. if xmpp.connect(): - # If you do not have the pydns library installed, you will need + # If you do not have the dnspython library installed, you will need # to manually specify the name of the server if it does not match # the one in the JID. For example, to use Google Talk you would # need to use: # # if xmpp.connect(('talk.google.com', 5222)): # ... - xmpp.process(threaded=False) + xmpp.process(block=True) print("Done") else: print("Unable to connect.") diff --git a/examples/adhoc_user.py b/examples/adhoc_user.py index ac157edd..0bc03c15 100755 --- a/examples/adhoc_user.py +++ b/examples/adhoc_user.py @@ -198,14 +198,14 @@ if __name__ == '__main__': # Connect to the XMPP server and start processing XMPP stanzas. if xmpp.connect(): - # If you do not have the pydns library installed, you will need + # If you do not have the dnspython library installed, you will need # to manually specify the name of the server if it does not match # the one in the JID. For example, to use Google Talk you would # need to use: # # if xmpp.connect(('talk.google.com', 5222)): # ... - xmpp.process(threaded=False) + xmpp.process(block=True) print("Done") else: print("Unable to connect.") diff --git a/examples/disco_browser.py b/examples/disco_browser.py index 0526bfc4..6023dd7e 100755 --- a/examples/disco_browser.py +++ b/examples/disco_browser.py @@ -188,13 +188,13 @@ if __name__ == '__main__': # Connect to the XMPP server and start processing XMPP stanzas. if xmpp.connect(): - # If you do not have the pydns library installed, you will need + # If you do not have the dnspython library installed, you will need # to manually specify the name of the server if it does not match # the one in the JID. For example, to use Google Talk you would # need to use: # # if xmpp.connect(('talk.google.com', 5222)): # ... - xmpp.process(threaded=False) + xmpp.process(block=True) else: print("Unable to connect.") diff --git a/examples/echo_client.py b/examples/echo_client.py index 7e882a4a..cbb04683 100755 --- a/examples/echo_client.py +++ b/examples/echo_client.py @@ -132,14 +132,14 @@ if __name__ == '__main__': # Connect to the XMPP server and start processing XMPP stanzas. if xmpp.connect(): - # If you do not have the pydns library installed, you will need + # If you do not have the dnspython library installed, you will need # to manually specify the name of the server if it does not match # the one in the JID. For example, to use Google Talk you would # need to use: # # if xmpp.connect(('talk.google.com', 5222)): # ... - xmpp.process(threaded=False) + xmpp.process(block=True) print("Done") else: print("Unable to connect.") diff --git a/examples/echo_component.py b/examples/echo_component.py index f569e001..d8bcd752 100755 --- a/examples/echo_component.py +++ b/examples/echo_component.py @@ -116,7 +116,7 @@ if __name__ == '__main__': # Connect to the XMPP server and start processing XMPP stanzas. if xmpp.connect(): - xmpp.process(threaded=False) + xmpp.process(block=True) print("Done") else: print("Unable to connect.") diff --git a/examples/muc.py b/examples/muc.py index 96b5fb83..7af37449 100755 --- a/examples/muc.py +++ b/examples/muc.py @@ -175,14 +175,14 @@ if __name__ == '__main__': # Connect to the XMPP server and start processing XMPP stanzas. if xmpp.connect(): - # If you do not have the pydns library installed, you will need + # If you do not have the dnspython library installed, you will need # to manually specify the name of the server if it does not match # the one in the JID. For example, to use Google Talk you would # need to use: # # if xmpp.connect(('talk.google.com', 5222)): # ... - xmpp.process(threaded=False) + xmpp.process(block=True) print("Done") else: print("Unable to connect.") diff --git a/examples/ping.py b/examples/ping.py index 462b8379..81194eef 100755 --- a/examples/ping.py +++ b/examples/ping.py @@ -129,14 +129,14 @@ if __name__ == '__main__': # Connect to the XMPP server and start processing XMPP stanzas. if xmpp.connect(): - # If you do not have the pydns library installed, you will need + # If you do not have the dnspython library installed, you will need # to manually specify the name of the server if it does not match # the one in the JID. For example, to use Google Talk you would # need to use: # # if xmpp.connect(('talk.google.com', 5222)): # ... - xmpp.process(threaded=False) + xmpp.process(block=True) print("Done") else: print("Unable to connect.") diff --git a/examples/proxy_echo_client.py b/examples/proxy_echo_client.py index 3466dc9b..1f4ba9d3 100755 --- a/examples/proxy_echo_client.py +++ b/examples/proxy_echo_client.py @@ -156,14 +156,14 @@ if __name__ == '__main__': # Connect to the XMPP server and start processing XMPP stanzas. if xmpp.connect(): - # If you do not have the pydns library installed, you will need + # If you do not have the dnspython library installed, you will need # to manually specify the name of the server if it does not match # the one in the JID. For example, to use Google Talk you would # need to use: # # if xmpp.connect(('talk.google.com', 5222)): # ... - xmpp.process(threaded=False) + xmpp.process(block=True) print("Done") else: print("Unable to connect.") diff --git a/examples/roster_browser.py b/examples/roster_browser.py index 4a58cc1c..7926b096 100644 --- a/examples/roster_browser.py +++ b/examples/roster_browser.py @@ -160,14 +160,14 @@ if __name__ == '__main__': # Connect to the XMPP server and start processing XMPP stanzas. if xmpp.connect(): - # If you do not have the pydns library installed, you will need + # If you do not have the dnspython library installed, you will need # to manually specify the name of the server if it does not match # the one in the JID. For example, to use Google Talk you would # need to use: # # if xmpp.connect(('talk.google.com', 5222)): # ... - xmpp.process(threaded=False) + xmpp.process(block=True) else: print("Unable to connect.") diff --git a/examples/send_client.py b/examples/send_client.py index d1dafee6..94bb584d 100755 --- a/examples/send_client.py +++ b/examples/send_client.py @@ -131,14 +131,14 @@ if __name__ == '__main__': # Connect to the XMPP server and start processing XMPP stanzas. if xmpp.connect(): - # If you do not have the pydns library installed, you will need + # If you do not have the dnspython library installed, you will need # to manually specify the name of the server if it does not match # the one in the JID. For example, to use Google Talk you would # need to use: # # if xmpp.connect(('talk.google.com', 5222)): # ... - xmpp.process(threaded=False) + xmpp.process(block=True) print("Done") else: print("Unable to connect.") diff --git a/sleekxmpp/stanza/message.py b/sleekxmpp/stanza/message.py index 3518fc7a..19d4d9e2 100644 --- a/sleekxmpp/stanza/message.py +++ b/sleekxmpp/stanza/message.py @@ -79,7 +79,7 @@ class Message(RootStanza): return self def normal(self): - """Set the message type to 'chat'.""" + """Set the message type to 'normal'.""" self['type'] = 'normal' return self