Remove raw_input usage and other python2 support in examples

This commit is contained in:
Emmanuel Gil Peyrot
2014-08-16 22:37:29 +02:00
committed by Florent Le Coz
parent 815e647c97
commit df68bb4896
26 changed files with 45 additions and 313 deletions

View File

@@ -9,7 +9,6 @@
See the file LICENSE for copying permission.
"""
import sys
import logging
import getpass
from optparse import OptionParser
@@ -18,17 +17,6 @@ import slixmpp
from slixmpp.exceptions import IqError, IqTimeout
# 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 Disco(slixmpp.ClientXMPP):
"""
@@ -176,7 +164,7 @@ if __name__ == '__main__':
args = (args[0], args[1], '')
if opts.jid is None:
opts.jid = raw_input("Username: ")
opts.jid = input("Username: ")
if opts.password is None:
opts.password = getpass.getpass("Password: ")