From df68bb48961574436c1ffc2463a31cd7d8227606 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sat, 16 Aug 2014 22:37:29 +0200 Subject: Remove raw_input usage and other python2 support in examples --- examples/custom_stanzas/custom_stanza_provider.py | 13 +------------ examples/custom_stanzas/custom_stanza_user.py | 15 ++------------- 2 files changed, 3 insertions(+), 25 deletions(-) (limited to 'examples/custom_stanzas') diff --git a/examples/custom_stanzas/custom_stanza_provider.py b/examples/custom_stanzas/custom_stanza_provider.py index 0356b973..5782b671 100755 --- a/examples/custom_stanzas/custom_stanza_provider.py +++ b/examples/custom_stanzas/custom_stanza_provider.py @@ -9,7 +9,6 @@ See the file LICENSE for copying permission. """ -import sys import logging import getpass from optparse import OptionParser @@ -23,16 +22,6 @@ from slixmpp.xmlstream.handler import Callback from slixmpp.xmlstream.matcher import StanzaPath from stanza import Action -# Python versions before 3.0 do not use UTF-8 encoding -# by default. To ensure that Unicode is handled properly -# throughout Slixmpp, we will set the default encoding -# ourselves to UTF-8. -if sys.version_info < (3, 0): - from slixmpp.util.misc_ops import setdefaultencoding - setdefaultencoding('utf8') -else: - raw_input = input - class ActionBot(slixmpp.ClientXMPP): @@ -138,7 +127,7 @@ if __name__ == '__main__': format='%(levelname)-8s %(message)s') if opts.jid is None: - opts.jid = raw_input("Username: ") + opts.jid = input("Username: ") if opts.password is None: opts.password = getpass.getpass("Password: ") diff --git a/examples/custom_stanzas/custom_stanza_user.py b/examples/custom_stanzas/custom_stanza_user.py index a7388cff..21722196 100755 --- a/examples/custom_stanzas/custom_stanza_user.py +++ b/examples/custom_stanzas/custom_stanza_user.py @@ -9,7 +9,6 @@ See the file LICENSE for copying permission. """ -import sys import logging import getpass from optparse import OptionParser @@ -21,16 +20,6 @@ from slixmpp.xmlstream import register_stanza_plugin from stanza import Action -# Python versions before 3.0 do not use UTF-8 encoding -# by default. To ensure that Unicode is handled properly -# throughout Slixmpp, we will set the default encoding -# ourselves to UTF-8. -if sys.version_info < (3, 0): - from slixmpp.util.misc_ops import setdefaultencoding - setdefaultencoding('utf8') -else: - raw_input = input - class ActionUserBot(slixmpp.ClientXMPP): @@ -139,11 +128,11 @@ if __name__ == '__main__': format='%(levelname)-8s %(message)s') if opts.jid is None: - opts.jid = raw_input("Username: ") + opts.jid = input("Username: ") if opts.password is None: opts.password = getpass.getpass("Password: ") if opts.other is None: - opts.other = raw_input("JID Providing custom stanza: ") + opts.other = input("JID Providing custom stanza: ") # Setup the CommandBot and register plugins. Note that while plugins may # have interdependencies, the order in which you register them does -- cgit v1.2.3