Merge pull request #130 from rhcarvalho/master

Some small fixes
This commit is contained in:
Lance Stout 2011-12-30 20:14:54 -08:00
commit 4e23a4e08e
11 changed files with 20 additions and 20 deletions

View file

@ -192,14 +192,14 @@ if __name__ == '__main__':
# Connect to the XMPP server and start processing XMPP stanzas. # Connect to the XMPP server and start processing XMPP stanzas.
if xmpp.connect(): 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 # 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 # the one in the JID. For example, to use Google Talk you would
# need to use: # need to use:
# #
# if xmpp.connect(('talk.google.com', 5222)): # if xmpp.connect(('talk.google.com', 5222)):
# ... # ...
xmpp.process(threaded=False) xmpp.process(block=True)
print("Done") print("Done")
else: else:
print("Unable to connect.") print("Unable to connect.")

View file

@ -198,14 +198,14 @@ if __name__ == '__main__':
# Connect to the XMPP server and start processing XMPP stanzas. # Connect to the XMPP server and start processing XMPP stanzas.
if xmpp.connect(): 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 # 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 # the one in the JID. For example, to use Google Talk you would
# need to use: # need to use:
# #
# if xmpp.connect(('talk.google.com', 5222)): # if xmpp.connect(('talk.google.com', 5222)):
# ... # ...
xmpp.process(threaded=False) xmpp.process(block=True)
print("Done") print("Done")
else: else:
print("Unable to connect.") print("Unable to connect.")

View file

@ -188,13 +188,13 @@ if __name__ == '__main__':
# Connect to the XMPP server and start processing XMPP stanzas. # Connect to the XMPP server and start processing XMPP stanzas.
if xmpp.connect(): 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 # 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 # the one in the JID. For example, to use Google Talk you would
# need to use: # need to use:
# #
# if xmpp.connect(('talk.google.com', 5222)): # if xmpp.connect(('talk.google.com', 5222)):
# ... # ...
xmpp.process(threaded=False) xmpp.process(block=True)
else: else:
print("Unable to connect.") print("Unable to connect.")

View file

@ -132,14 +132,14 @@ if __name__ == '__main__':
# Connect to the XMPP server and start processing XMPP stanzas. # Connect to the XMPP server and start processing XMPP stanzas.
if xmpp.connect(): 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 # 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 # the one in the JID. For example, to use Google Talk you would
# need to use: # need to use:
# #
# if xmpp.connect(('talk.google.com', 5222)): # if xmpp.connect(('talk.google.com', 5222)):
# ... # ...
xmpp.process(threaded=False) xmpp.process(block=True)
print("Done") print("Done")
else: else:
print("Unable to connect.") print("Unable to connect.")

View file

@ -116,7 +116,7 @@ if __name__ == '__main__':
# Connect to the XMPP server and start processing XMPP stanzas. # Connect to the XMPP server and start processing XMPP stanzas.
if xmpp.connect(): if xmpp.connect():
xmpp.process(threaded=False) xmpp.process(block=True)
print("Done") print("Done")
else: else:
print("Unable to connect.") print("Unable to connect.")

View file

@ -175,14 +175,14 @@ if __name__ == '__main__':
# Connect to the XMPP server and start processing XMPP stanzas. # Connect to the XMPP server and start processing XMPP stanzas.
if xmpp.connect(): 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 # 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 # the one in the JID. For example, to use Google Talk you would
# need to use: # need to use:
# #
# if xmpp.connect(('talk.google.com', 5222)): # if xmpp.connect(('talk.google.com', 5222)):
# ... # ...
xmpp.process(threaded=False) xmpp.process(block=True)
print("Done") print("Done")
else: else:
print("Unable to connect.") print("Unable to connect.")

View file

@ -129,14 +129,14 @@ if __name__ == '__main__':
# Connect to the XMPP server and start processing XMPP stanzas. # Connect to the XMPP server and start processing XMPP stanzas.
if xmpp.connect(): 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 # 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 # the one in the JID. For example, to use Google Talk you would
# need to use: # need to use:
# #
# if xmpp.connect(('talk.google.com', 5222)): # if xmpp.connect(('talk.google.com', 5222)):
# ... # ...
xmpp.process(threaded=False) xmpp.process(block=True)
print("Done") print("Done")
else: else:
print("Unable to connect.") print("Unable to connect.")

View file

@ -156,14 +156,14 @@ if __name__ == '__main__':
# Connect to the XMPP server and start processing XMPP stanzas. # Connect to the XMPP server and start processing XMPP stanzas.
if xmpp.connect(): 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 # 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 # the one in the JID. For example, to use Google Talk you would
# need to use: # need to use:
# #
# if xmpp.connect(('talk.google.com', 5222)): # if xmpp.connect(('talk.google.com', 5222)):
# ... # ...
xmpp.process(threaded=False) xmpp.process(block=True)
print("Done") print("Done")
else: else:
print("Unable to connect.") print("Unable to connect.")

View file

@ -160,14 +160,14 @@ if __name__ == '__main__':
# Connect to the XMPP server and start processing XMPP stanzas. # Connect to the XMPP server and start processing XMPP stanzas.
if xmpp.connect(): 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 # 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 # the one in the JID. For example, to use Google Talk you would
# need to use: # need to use:
# #
# if xmpp.connect(('talk.google.com', 5222)): # if xmpp.connect(('talk.google.com', 5222)):
# ... # ...
xmpp.process(threaded=False) xmpp.process(block=True)
else: else:
print("Unable to connect.") print("Unable to connect.")

View file

@ -131,14 +131,14 @@ if __name__ == '__main__':
# Connect to the XMPP server and start processing XMPP stanzas. # Connect to the XMPP server and start processing XMPP stanzas.
if xmpp.connect(): 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 # 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 # the one in the JID. For example, to use Google Talk you would
# need to use: # need to use:
# #
# if xmpp.connect(('talk.google.com', 5222)): # if xmpp.connect(('talk.google.com', 5222)):
# ... # ...
xmpp.process(threaded=False) xmpp.process(block=True)
print("Done") print("Done")
else: else:
print("Unable to connect.") print("Unable to connect.")

View file

@ -79,7 +79,7 @@ class Message(RootStanza):
return self return self
def normal(self): def normal(self):
"""Set the message type to 'chat'.""" """Set the message type to 'normal'."""
self['type'] = 'normal' self['type'] = 'normal'
return self return self