Skip to content

Commit

Permalink
Merge pull request fritzy#130 from rhcarvalho/master
Browse files Browse the repository at this point in the history 
Some small fixes
  • Loading branch information
@legastero
legastero committed Dec 31, 2011
2 parents 522f0da + 8cafa85 commit 4e23a4e
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions examples/adhoc_provider.py
View file
Expand Up @@ -192,14 +192,14 @@ def _handle_command_complete(self, payload, session):

# 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.")
4 changes: 2 additions & 2 deletions examples/adhoc_user.py
View file
Expand Up @@ -198,14 +198,14 @@ def _command_error(self, iq, session):

# 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.")
4 changes: 2 additions & 2 deletions examples/disco_browser.py
View file
Expand Up @@ -188,13 +188,13 @@ def start(self, event):

# 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.")
4 changes: 2 additions & 2 deletions examples/echo_client.py
View file
Expand Up @@ -132,14 +132,14 @@ def message(self, msg):

# 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.")
2 changes: 1 addition & 1 deletion examples/echo_component.py
View file
Expand Up @@ -116,7 +116,7 @@ def message(self, msg):

# 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.")
4 changes: 2 additions & 2 deletions examples/muc.py
View file
Expand Up @@ -175,14 +175,14 @@ def muc_online(self, presence):

# 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.")
4 changes: 2 additions & 2 deletions examples/ping.py
View file
Expand Up @@ -129,14 +129,14 @@ def start(self, event):

# 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.")
4 changes: 2 additions & 2 deletions examples/proxy_echo_client.py
View file
Expand Up @@ -156,14 +156,14 @@ def message(self, msg):

# 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.")
4 changes: 2 additions & 2 deletions examples/roster_browser.py
View file
Expand Up @@ -160,14 +160,14 @@ def wait_for_presences(self, pres):

# 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.")

4 changes: 2 additions & 2 deletions examples/send_client.py
View file
Expand Up @@ -131,14 +131,14 @@ def start(self, event):

# 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.")
2 changes: 1 addition & 1 deletion sleekxmpp/stanza/message.py
View file
Expand Up @@ -79,7 +79,7 @@ def chat(self):
return self

def normal(self):
"""Set the message type to 'chat'."""
"""Set the message type to 'normal'."""
self['type'] = 'normal'
return self

Expand Down

0 comments on commit 4e23a4e

Please sign in to comment.