summaryrefslogtreecommitdiff
path: root/examples/custom_stanzas
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-24 13:07:19 -0700
committerLance Stout <lancestout@gmail.com>2012-10-24 13:07:19 -0700
commit06a690a2592cba388877391935ed4168d101a231 (patch)
tree54d5f70297b425cbb47ebc13415eaccf914c2152 /examples/custom_stanzas
parent14c9e9a9cc263a2695cb9d8e5575d60bd0a55197 (diff)
parent52feabbe7641f19a17810438d2469b2395b2819f (diff)
downloadslixmpp-06a690a2592cba388877391935ed4168d101a231.tar.gz
slixmpp-06a690a2592cba388877391935ed4168d101a231.tar.bz2
slixmpp-06a690a2592cba388877391935ed4168d101a231.tar.xz
slixmpp-06a690a2592cba388877391935ed4168d101a231.zip
Merge branch 'master' into develop
Diffstat (limited to 'examples/custom_stanzas')
-rwxr-xr-xexamples/custom_stanzas/custom_stanza_provider.py8
-rwxr-xr-xexamples/custom_stanzas/custom_stanza_user.py4
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/custom_stanzas/custom_stanza_provider.py b/examples/custom_stanzas/custom_stanza_provider.py
index b532c17c..b0e00247 100755
--- a/examples/custom_stanzas/custom_stanza_provider.py
+++ b/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)
- sys.setdefaultencoding('utf8')
+ from sleekxmpp.util.misc_ops import setdefaultencoding
+ setdefaultencoding('utf8')
else:
raw_input = input
@@ -56,8 +56,8 @@ class ActionBot(sleekxmpp.ClientXMPP):
StanzaPath('iq@type=set/action'),
self._handle_action))
- self.add_event_handler('custom_action',
- self._handle_action_event,
+ self.add_event_handler('custom_action',
+ self._handle_action_event,
threaded=True)
register_stanza_plugin(Iq, Action)
diff --git a/examples/custom_stanzas/custom_stanza_user.py b/examples/custom_stanzas/custom_stanza_user.py
index 5b5042c7..418e3218 100755
--- a/examples/custom_stanzas/custom_stanza_user.py
+++ b/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)
- sys.setdefaultencoding('utf8')
+ from sleekxmpp.util.misc_ops import setdefaultencoding
+ setdefaultencoding('utf8')
else:
raw_input = input