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/adhoc_user.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'examples/adhoc_user.py') diff --git a/examples/adhoc_user.py b/examples/adhoc_user.py index be587e41..646b41ac 100755 --- a/examples/adhoc_user.py +++ b/examples/adhoc_user.py @@ -9,23 +9,12 @@ See the file LICENSE for copying permission. """ -import sys import logging import getpass from optparse import OptionParser import slixmpp -# 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 CommandUserBot(slixmpp.ClientXMPP): @@ -172,13 +161,13 @@ 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 Commands: ") + opts.other = input("JID Providing Commands: ") if opts.greeting is None: - opts.greeting = raw_input("Greeting: ") + opts.greeting = input("Greeting: ") # 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