diff options
author | Lance Stout <lancestout@gmail.com> | 2012-10-24 13:07:19 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-10-24 13:07:19 -0700 |
commit | 06a690a2592cba388877391935ed4168d101a231 (patch) | |
tree | 54d5f70297b425cbb47ebc13415eaccf914c2152 /docs/getting_started | |
parent | 14c9e9a9cc263a2695cb9d8e5575d60bd0a55197 (diff) | |
parent | 52feabbe7641f19a17810438d2469b2395b2819f (diff) | |
download | slixmpp-06a690a2592cba388877391935ed4168d101a231.tar.gz slixmpp-06a690a2592cba388877391935ed4168d101a231.tar.bz2 slixmpp-06a690a2592cba388877391935ed4168d101a231.tar.xz slixmpp-06a690a2592cba388877391935ed4168d101a231.zip |
Merge branch 'master' into develop
Diffstat (limited to 'docs/getting_started')
-rw-r--r-- | docs/getting_started/echobot.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/getting_started/echobot.rst b/docs/getting_started/echobot.rst index 053a76f2..7d29ec58 100644 --- a/docs/getting_started/echobot.rst +++ b/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) - sys.setdefaultencoding('utf8') + from sleekxmpp.util.misc_ops import setdefaultencoding + setdefaultencoding('utf8') .. warning:: |