jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove raw_input usage and other python2 support in examples

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/migrate_roster.py
View File

@@ -8,16 +8,6 @@ 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
# Setup the command line arguments.
optp = OptionParser()
@@ -52,12 +42,12 @@ logging.basicConfig(level=opts.loglevel,
format='%(levelname)-8s %(message)s')
if opts.old_jid is None:
opts.old_jid = raw_input("Old JID: ")
opts.old_jid = input("Old JID: ")
if opts.old_password is None:
opts.old_password = getpass.getpass("Old Password: ")
if opts.new_jid is None:
opts.new_jid = raw_input("New JID: ")
opts.new_jid = input("New JID: ")
if opts.new_password is None:
opts.new_password = getpass.getpass("New Password: ")