diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-02-02 09:13:22 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-02-02 09:13:22 -0500 |
| commit | de6170a13de2dbb3cbcfbf4a74b749f20b0cf061 (patch) | |
| tree | b60043234119a3d215e0eca65913dd038167b551 /sleekxmpp/thirdparty/__init__.py | |
| parent | 65931bb384aada922c5287a3ad3cc62d04d6e676 (diff) | |
| parent | 8dbe6f65462ec9b1a0506a00316415996f4d53d8 (diff) | |
| download | slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.gz slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.bz2 slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.tar.xz slixmpp-de6170a13de2dbb3cbcfbf4a74b749f20b0cf061.zip | |
Merge branch 'develop' into roster
Conflicts:
sleekxmpp/basexmpp.py
Diffstat (limited to 'sleekxmpp/thirdparty/__init__.py')
| -rw-r--r-- | sleekxmpp/thirdparty/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sleekxmpp/thirdparty/__init__.py b/sleekxmpp/thirdparty/__init__.py index e69de29b..276ac3cc 100644 --- a/sleekxmpp/thirdparty/__init__.py +++ b/sleekxmpp/thirdparty/__init__.py @@ -0,0 +1,4 @@ +try: + from collections import OrderedDict +except: + from sleekxmpp.thirdparty.ordereddict import OrderedDict |