diff options
Diffstat (limited to 'examples/disco_browser.py')
-rwxr-xr-x | examples/disco_browser.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/examples/disco_browser.py b/examples/disco_browser.py index ec2e6ede..b088fdc0 100755 --- a/examples/disco_browser.py +++ b/examples/disco_browser.py @@ -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: ") |