Remove raw_input usage and other python2 support in examples

2 files changed, 4 insertions, 26 deletions

diff --git a/examples/ibb_transfer/ibb_receiver.py b/examples/ibb_transfer/ibb_receiver.py
index 1f78ce05..dd9171d2 100755
--- a/examples/ibb_transfer/ibb_receiver.py
+++ b/examples/ibb_transfer/ibb_receiver.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 IBBReceiver(slixmpp.ClientXMPP):
 
@@ -119,7 +108,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: ")
 
diff --git a/examples/ibb_transfer/ibb_sender.py b/examples/ibb_transfer/ibb_sender.py
index 5366c6ff..2d88d4ce 100755
--- a/examples/ibb_transfer/ibb_sender.py
+++ b/examples/ibb_transfer/ibb_sender.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 IBBSender(slixmpp.ClientXMPP):
 
@@ -105,13 +94,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.receiver is None:
-        opts.receiver = raw_input("Receiver: ")
+        opts.receiver = input("Receiver: ")
     if opts.filename is None:
-        opts.filename = raw_input("File path: ")
+        opts.filename = input("File path: ")
 
     # Setup the EchoBot and register plugins. Note that while plugins may
     # have interdependencies, the order in which you register them does