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/proxy_echo_client.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'examples/proxy_echo_client.py') diff --git a/examples/proxy_echo_client.py b/examples/proxy_echo_client.py index 161d6d70..b4b4dab4 100755 --- a/examples/proxy_echo_client.py +++ b/examples/proxy_echo_client.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 EchoBot(slixmpp.ClientXMPP): @@ -118,15 +107,15 @@ 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.proxy_host is None: - opts.proxy_host = raw_input("Proxy host: ") + opts.proxy_host = input("Proxy host: ") if opts.proxy_port is None: - opts.proxy_port = raw_input("Proxy port: ") + opts.proxy_port = input("Proxy port: ") if opts.proxy_user is None: - opts.proxy_user = raw_input("Proxy username: ") + opts.proxy_user = input("Proxy username: ") if opts.proxy_pass is None and opts.proxy_user: opts.proxy_pass = getpass.getpass("Proxy password: ") -- cgit v1.2.3