diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2014-08-16 22:37:29 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-09-01 02:42:45 +0200 |
| commit | df68bb48961574436c1ffc2463a31cd7d8227606 (patch) | |
| tree | b8cf94afe4f18b3fe75baaf63a1c9c0c5c1b314b /examples/pubsub_client.py | |
| parent | 815e647c97c0b9a25d177bb698b4f737340987b5 (diff) | |
| download | slixmpp-df68bb48961574436c1ffc2463a31cd7d8227606.tar.gz slixmpp-df68bb48961574436c1ffc2463a31cd7d8227606.tar.bz2 slixmpp-df68bb48961574436c1ffc2463a31cd7d8227606.tar.xz slixmpp-df68bb48961574436c1ffc2463a31cd7d8227606.zip | |
Remove raw_input usage and other python2 support in examples
Diffstat (limited to 'examples/pubsub_client.py')
| -rwxr-xr-x | examples/pubsub_client.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/examples/pubsub_client.py b/examples/pubsub_client.py index afbb437f..3b413e24 100755 --- a/examples/pubsub_client.py +++ b/examples/pubsub_client.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -import sys import logging import getpass from optparse import OptionParser @@ -10,17 +9,6 @@ import slixmpp from slixmpp.xmlstream import ET, tostring -# 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 PubsubClient(slixmpp.ClientXMPP): def __init__(self, jid, password, server, @@ -161,7 +149,7 @@ if __name__ == '__main__': exit() if opts.jid is None: - opts.jid = raw_input("Username: ") + opts.jid = input("Username: ") if opts.password is None: opts.password = getpass.getpass("Password: ") |