summaryrefslogtreecommitdiff
path: root/examples/pubsub_events.py
diff options
context:
space:
mode:
Diffstat (limited to 'examples/pubsub_events.py')
-rwxr-xr-xexamples/pubsub_events.py14
1 files changed, 1 insertions, 13 deletions
diff --git a/examples/pubsub_events.py b/examples/pubsub_events.py
index 6464db97..f2384db8 100755
--- a/examples/pubsub_events.py
+++ b/examples/pubsub_events.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-import sys
import logging
import getpass
from optparse import OptionParser
@@ -12,17 +11,6 @@ from slixmpp.xmlstream.matcher import StanzaPath
from slixmpp.xmlstream.handler import Callback
-# 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 PubsubEvents(slixmpp.ClientXMPP):
def __init__(self, jid, password):
@@ -122,7 +110,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: ")