Remove raw_input usage and other python2 support in examples

1 files changed, 2 insertions, 14 deletions

diff --git a/examples/set_avatar.py b/examples/set_avatar.py
index db189413..e687e6e0 100755
--- a/examples/set_avatar.py
+++ b/examples/set_avatar.py
@@ -10,7 +10,6 @@
 """
 
 import os
-import sys
 import imghdr
 import logging
 import getpass
@@ -21,17 +20,6 @@ import slixmpp
 from slixmpp.exceptions import XMPPError
 
 
-# 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 AvatarSetter(slixmpp.ClientXMPP):
 
     """
@@ -142,11 +130,11 @@ 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.filepath is None:
-        opts.filepath = raw_input("Avatar file location: ")
+        opts.filepath = input("Avatar file location: ")
 
     xmpp = AvatarSetter(opts.jid, opts.password, opts.filepath)
     xmpp.register_plugin('xep_0054')