summaryrefslogtreecommitdiff
path: root/examples/muc.py
diff options
context:
space:
mode:
Diffstat (limited to 'examples/muc.py')
-rwxr-xr-xexamples/muc.py17
1 files changed, 3 insertions, 14 deletions
diff --git a/examples/muc.py b/examples/muc.py
index e67196dd..08a71a44 100755
--- a/examples/muc.py
+++ b/examples/muc.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 MUCBot(slixmpp.ClientXMPP):
@@ -162,13 +151,13 @@ 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: ")
if opts.room is None:
- opts.room = raw_input("MUC room: ")
+ opts.room = input("MUC room: ")
if opts.nick is None:
- opts.nick = raw_input("MUC nickname: ")
+ opts.nick = input("MUC nickname: ")
# Setup the MUCBot and register plugins. Note that while plugins may
# have interdependencies, the order in which you register them does