diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-01-13 10:20:34 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-01-13 10:20:34 -0500 |
| commit | b71550cec7c85ceb4126daddbc39ed0d0e93b8d5 (patch) | |
| tree | 5679328a80f993e23d06f3ec39733e8d69055776 | |
| parent | ba0d699d831975eb4c0f9e5e441bba2972f91806 (diff) | |
| parent | 7d93d1824be88c170a025d57afd3e54a06712d9d (diff) | |
| download | slixmpp-b71550cec7c85ceb4126daddbc39ed0d0e93b8d5.tar.gz slixmpp-b71550cec7c85ceb4126daddbc39ed0d0e93b8d5.tar.bz2 slixmpp-b71550cec7c85ceb4126daddbc39ed0d0e93b8d5.tar.xz slixmpp-b71550cec7c85ceb4126daddbc39ed0d0e93b8d5.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/plugins/old_0004.py | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -46,7 +46,7 @@ packages = [ 'sleekxmpp', 'sleekxmpp/thirdparty',
'sleekxmpp/plugins',
'sleekxmpp/plugins/xep_0030',
- 'sleekxmpp/plugins/xep_0030/stanza'
+ 'sleekxmpp/plugins/xep_0030/stanza',
'sleekxmpp/plugins/xep_0059',
'sleekxmpp/plugins/xep_0092',
]
diff --git a/sleekxmpp/plugins/old_0004.py b/sleekxmpp/plugins/old_0004.py index ade3d682..7f086866 100644 --- a/sleekxmpp/plugins/old_0004.py +++ b/sleekxmpp/plugins/old_0004.py @@ -6,7 +6,7 @@ See the file LICENSE for copying permission. """ from . import base -import log +import logging from xml.etree import cElementTree as ET import copy import logging |