summaryrefslogtreecommitdiff
path: root/examples/echo_client.py
diff options
context:
space:
mode:
Diffstat (limited to 'examples/echo_client.py')
-rwxr-xr-xexamples/echo_client.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/examples/echo_client.py b/examples/echo_client.py
index cf79867b..733b541d 100755
--- a/examples/echo_client.py
+++ b/examples/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):
@@ -109,7 +98,7 @@ 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: ")