From 882f984b2622a6e44cce5401b8673760f559f718 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sat, 16 Aug 2014 22:37:29 +0200 Subject: Remove (usually) useless comments in examples about OpenFire and how to verify a certificate. --- examples/adhoc_provider.py | 7 ------- examples/adhoc_user.py | 7 ------- examples/admin_commands.py | 7 ------- examples/custom_stanzas/custom_stanza_provider.py | 7 ------- examples/custom_stanzas/custom_stanza_user.py | 7 ------- examples/disco_browser.py | 7 ------- examples/download_avatars.py | 7 ------- examples/echo_client.py | 20 -------------------- examples/gtalk_custom_domain.py | 7 ------- examples/ibb_transfer/ibb_receiver.py | 7 ------- examples/ibb_transfer/ibb_sender.py | 7 ------- examples/ping.py | 7 ------- examples/proxy_echo_client.py | 7 ------- examples/pubsub_client.py | 7 ------- examples/pubsub_events.py | 7 ------- examples/register_account.py | 7 ------- examples/roster_browser.py | 7 ------- examples/send_client.py | 7 ------- examples/set_avatar.py | 7 ------- examples/user_location.py | 7 ------- examples/user_tune.py | 7 ------- 21 files changed, 160 deletions(-) (limited to 'examples') diff --git a/examples/adhoc_provider.py b/examples/adhoc_provider.py index e4a8fc04..7d1a41ee 100755 --- a/examples/adhoc_provider.py +++ b/examples/adhoc_provider.py @@ -171,13 +171,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0050') # Adhoc Commands xmpp.register_plugin('xep_0199', {'keepalive': True, 'frequency':15}) - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/adhoc_user.py b/examples/adhoc_user.py index 4aa2a236..31ff0d11 100755 --- a/examples/adhoc_user.py +++ b/examples/adhoc_user.py @@ -177,13 +177,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0004') # Data Forms xmpp.register_plugin('xep_0050') # Adhoc Commands - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/admin_commands.py b/examples/admin_commands.py index 97708cd8..ef0dc5bf 100755 --- a/examples/admin_commands.py +++ b/examples/admin_commands.py @@ -145,13 +145,6 @@ if __name__ == '__main__': xmpp = AdminCommands(opts.jid, opts.password, opts.command) xmpp.register_plugin('xep_0133') # Service Administration - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/custom_stanzas/custom_stanza_provider.py b/examples/custom_stanzas/custom_stanza_provider.py index cfc8335d..fc04bdd4 100755 --- a/examples/custom_stanzas/custom_stanza_provider.py +++ b/examples/custom_stanzas/custom_stanza_provider.py @@ -135,13 +135,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0050') # Adhoc Commands xmpp.register_plugin('xep_0199', {'keepalive': True, 'frequency':15}) - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/custom_stanzas/custom_stanza_user.py b/examples/custom_stanzas/custom_stanza_user.py index 891eb72b..95837106 100755 --- a/examples/custom_stanzas/custom_stanza_user.py +++ b/examples/custom_stanzas/custom_stanza_user.py @@ -142,13 +142,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0004') # Data Forms xmpp.register_plugin('xep_0050') # Adhoc Commands - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/disco_browser.py b/examples/disco_browser.py index 2f926687..2a4ce543 100755 --- a/examples/disco_browser.py +++ b/examples/disco_browser.py @@ -171,13 +171,6 @@ if __name__ == '__main__': # Setup the Disco browser. xmpp = Disco(opts.jid, opts.password, args[1], args[2], args[0]) - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/download_avatars.py b/examples/download_avatars.py index 61b07c58..d2e3ab2a 100755 --- a/examples/download_avatars.py +++ b/examples/download_avatars.py @@ -151,13 +151,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0153') xmpp.register_plugin('xep_0084') - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/echo_client.py b/examples/echo_client.py index de649eb6..1046bd43 100755 --- a/examples/echo_client.py +++ b/examples/echo_client.py @@ -111,26 +111,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0060') # PubSub xmpp.register_plugin('xep_0199') # XMPP Ping - # If you are connecting to Facebook and wish to use the - # X-FACEBOOK-PLATFORM authentication mechanism, you will need - # your API key and an access token. Then you'll set: - # xmpp.credentials['api_key'] = 'THE_API_KEY' - # xmpp.credentials['access_token'] = 'THE_ACCESS_TOKEN' - - # If you are connecting to MSN, then you will need an - # access token, and it does not matter what JID you - # specify other than that the domain is 'messenger.live.com', - # so '_@messenger.live.com' will work. You can specify - # the access token as so: - # xmpp.credentials['access_token'] = 'THE_ACCESS_TOKEN' - - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/gtalk_custom_domain.py b/examples/gtalk_custom_domain.py index 8c280ac4..2c1d5beb 100755 --- a/examples/gtalk_custom_domain.py +++ b/examples/gtalk_custom_domain.py @@ -131,13 +131,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0060') # PubSub xmpp.register_plugin('xep_0199') # XMPP Ping - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/ibb_transfer/ibb_receiver.py b/examples/ibb_transfer/ibb_receiver.py index 02c899eb..9045bd69 100755 --- a/examples/ibb_transfer/ibb_receiver.py +++ b/examples/ibb_transfer/ibb_receiver.py @@ -114,13 +114,6 @@ if __name__ == '__main__': xmpp = IBBReceiver(opts.jid, opts.password) - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/ibb_transfer/ibb_sender.py b/examples/ibb_transfer/ibb_sender.py index f5e44fb7..261202aa 100755 --- a/examples/ibb_transfer/ibb_sender.py +++ b/examples/ibb_transfer/ibb_sender.py @@ -112,13 +112,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0060') # PubSub xmpp.register_plugin('xep_0199') # XMPP Ping - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/ping.py b/examples/ping.py index 8ecb8cff..dd3ce737 100755 --- a/examples/ping.py +++ b/examples/ping.py @@ -110,13 +110,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0060') # PubSub xmpp.register_plugin('xep_0199') # XMPP Ping - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/proxy_echo_client.py b/examples/proxy_echo_client.py index e1eab19f..56ecb78f 100755 --- a/examples/proxy_echo_client.py +++ b/examples/proxy_echo_client.py @@ -128,13 +128,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0060') # PubSub xmpp.register_plugin('xep_0199') # XMPP Ping - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - xmpp.use_proxy = True xmpp.proxy_config = { 'host': opts.proxy_host, diff --git a/examples/pubsub_client.py b/examples/pubsub_client.py index 1e24dbd8..36d044fd 100755 --- a/examples/pubsub_client.py +++ b/examples/pubsub_client.py @@ -168,13 +168,6 @@ if __name__ == '__main__': action=args[1], data=args[3]) - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/pubsub_events.py b/examples/pubsub_events.py index f4be2d6c..eb678cfd 100755 --- a/examples/pubsub_events.py +++ b/examples/pubsub_events.py @@ -120,13 +120,6 @@ if __name__ == '__main__': # Setup the PubsubEvents listener xmpp = PubsubEvents(opts.jid, opts.password) - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/register_account.py b/examples/register_account.py index 396b23c6..29885f90 100755 --- a/examples/register_account.py +++ b/examples/register_account.py @@ -146,13 +146,6 @@ if __name__ == '__main__': # though they allow it. If this applies to your server, use: xmpp['xep_0077'].force_registration = True - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/roster_browser.py b/examples/roster_browser.py index 0bdc7c18..8f3e0d80 100755 --- a/examples/roster_browser.py +++ b/examples/roster_browser.py @@ -136,13 +136,6 @@ if __name__ == '__main__': xmpp = RosterBrowser(opts.jid, opts.password) - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/send_client.py b/examples/send_client.py index 17dffcaa..9a03f708 100755 --- a/examples/send_client.py +++ b/examples/send_client.py @@ -110,13 +110,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0030') # Service Discovery xmpp.register_plugin('xep_0199') # XMPP Ping - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/set_avatar.py b/examples/set_avatar.py index 452363b7..e446497b 100755 --- a/examples/set_avatar.py +++ b/examples/set_avatar.py @@ -141,13 +141,6 @@ if __name__ == '__main__': xmpp.register_plugin('xep_0153') xmpp.register_plugin('xep_0084') - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/user_location.py b/examples/user_location.py index 3e484d72..74cad8af 100755 --- a/examples/user_location.py +++ b/examples/user_location.py @@ -103,13 +103,6 @@ if __name__ == '__main__': xmpp = LocationBot(opts.jid, opts.password) - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() diff --git a/examples/user_tune.py b/examples/user_tune.py index 4ecfdb7d..2f28de35 100755 --- a/examples/user_tune.py +++ b/examples/user_tune.py @@ -115,13 +115,6 @@ if __name__ == '__main__': xmpp = TuneBot(opts.jid, opts.password) - # If you are working with an OpenFire server, you may need - # to adjust the SSL version used: - # xmpp.ssl_version = ssl.PROTOCOL_SSLv3 - - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - # Connect to the XMPP server and start processing XMPP stanzas. xmpp.connect() xmpp.process() -- cgit v1.2.3