added setdefaultencoding method so reload(sys) not needed

reload(sys) could cause problem in user code - ie, sys.stdout, excepthook, and displayhook would be reset, etc

docs/getting_started/echobot.rst

@@ -69,8 +69,8 @@ use ASCII. We can get Python to use UTF-8 as the default encoding by including:
 .. code-block:: python
 
     if sys.version_info < (3, 0):
-        reload(sys)
+        from sleekxmpp.util.misc_ops import setdefaultencoding
-        sys.setdefaultencoding('utf8')
+        setdefaultencoding('utf8')
 
 .. warning::
 

examples/adhoc_provider.py

@@ -21,8 +21,8 @@ import sleekxmpp
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/adhoc_user.py

@@ -21,8 +21,8 @@ import sleekxmpp
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/admin_commands.py

@@ -21,8 +21,8 @@ import sleekxmpp
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/custom_stanzas/custom_stanza_provider.py

@@ -28,8 +28,8 @@ from stanza import Action
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/custom_stanzas/custom_stanza_user.py

@@ -26,8 +26,8 @@ from stanza import Action
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/disco_browser.py

@@ -23,8 +23,8 @@ from sleekxmpp.exceptions import IqError, IqTimeout
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/download_avatars.py

@@ -24,8 +24,8 @@ from sleekxmpp.exceptions import XMPPError
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/echo_client.py

@@ -21,8 +21,8 @@ import sleekxmpp
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/echo_component.py

@@ -22,8 +22,8 @@ from sleekxmpp.componentxmpp import ComponentXMPP
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/gtalk_custom_domain.py

@@ -25,8 +25,8 @@ from sleekxmpp.xmlstream import cert
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/ibb_transfer/ibb_receiver.py

@@ -21,8 +21,8 @@ import sleekxmpp
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/ibb_transfer/ibb_sender.py

@@ -21,8 +21,8 @@ import sleekxmpp
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/muc.py

@@ -21,8 +21,8 @@ import sleekxmpp
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/ping.py

@@ -21,8 +21,8 @@ import sleekxmpp
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/proxy_echo_client.py

@@ -21,8 +21,8 @@ import sleekxmpp
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/pubsub_client.py

@@ -12,8 +12,8 @@ from sleekxmpp.xmlstream import ET, tostring
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/pubsub_events.py

@@ -14,8 +14,8 @@ from sleekxmpp.xmlstream.handler import Callback
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/register_account.py

@@ -22,8 +22,8 @@ from sleekxmpp.exceptions import IqError, IqTimeout
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/roster_browser.py

@@ -24,8 +24,8 @@ from sleekxmpp.exceptions import IqError, IqTimeout
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/send_client.py

@@ -21,8 +21,8 @@ import sleekxmpp
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/set_avatar.py

@@ -26,8 +26,8 @@ from sleekxmpp.exceptions import XMPPError
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

examples/thirdparty_auth.py

@@ -29,8 +29,8 @@ from sleekxmpp.xmlstream import JID
 # throughout SleekXMPP, we will set the default encoding
 # ourselves to UTF-8.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 else:
     raw_input = input
 

sleekxmpp/basexmpp.py

@@ -43,8 +43,8 @@ log = logging.getLogger(__name__)
 # In order to make sure that Unicode is handled properly
 # in Python 2.x, reset the default encoding.
 if sys.version_info < (3, 0):
-    reload(sys)
+    from sleekxmpp.util.misc_ops import setdefaultencoding
-    sys.setdefaultencoding('utf8')
+    setdefaultencoding('utf8')
 
 
 class BaseXMPP(XMLStream):

sleekxmpp/util/misc_ops.py

@@ -125,3 +125,27 @@ def hashes():
         t += ['MD2']
     hashes = ['SHA-' + h[3:] for h in dir(hashlib) if h.startswith('sha')]
     return t + hashes
+
+def setdefaultencoding(encoding):
+    """
+    Set the current default string encoding used by the Unicode implementation.
+
+    Actually calls sys.setdefaultencoding under the hood - see the docs for that
+    for more details.  This method exists only as a way to call find/call it
+    even after it has been 'deleted' when the site module is executed.
+
+    :param string encoding: An encoding name, compatible with sys.setdefaultencoding
+    """
+    func = getattr(sys, 'setdefaultencoding', None)
+    if func is None:
+        import gc
+        import types
+        for obj in gc.get_objects():
+            if (isinstance(obj, types.BuiltinFunctionType)
+                    and obj.__name__ == 'setdefaultencoding'):
+                func = obj
+                break
+        if func is None:
+            raise RuntimeError("Could not find setdefaultencoding")
+        sys.setdefaultencoding = func
+    return func(encoding)