summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-12-31 01:29:12 -0500
committerLance Stout <lancestout@gmail.com>2011-12-31 01:29:12 -0500
commite0545bf0bc06893ca905b2a3ebb4d09c76c24f0c (patch)
tree6a5fe2cee8a3a4bb77d7b99d2d80d9fc7be2511d /examples
parentd817d64c65c62976481690c0bfc3882621ac0455 (diff)
parent03bc38f7e34f6f8f6d79b58477d56df8e488578c (diff)
downloadslixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.tar.gz
slixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.tar.bz2
slixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.tar.xz
slixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.zip
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'examples')
-rwxr-xr-xexamples/adhoc_provider.py4
-rwxr-xr-xexamples/adhoc_user.py4
-rwxr-xr-xexamples/disco_browser.py4
-rwxr-xr-xexamples/echo_client.py4
-rwxr-xr-xexamples/echo_component.py2
-rwxr-xr-xexamples/muc.py4
-rwxr-xr-xexamples/ping.py4
-rwxr-xr-xexamples/proxy_echo_client.py4
-rw-r--r--examples/roster_browser.py4
-rwxr-xr-xexamples/send_client.py4
10 files changed, 19 insertions, 19 deletions
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.")