summaryrefslogtreecommitdiff
path: root/slixmpp/thirdparty/__init__.py
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2014-08-17 21:49:03 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-09-01 02:47:15 +0200
commited37174a2b40d2d90aa6a0c7f778108687d39602 (patch)
tree307a0dd3468f9e7d96ef72676dadd50335efebbf /slixmpp/thirdparty/__init__.py
parent866014896091d83164a6503adf9035146cf49963 (diff)
downloadslixmpp-ed37174a2b40d2d90aa6a0c7f778108687d39602.tar.gz
slixmpp-ed37174a2b40d2d90aa6a0c7f778108687d39602.tar.bz2
slixmpp-ed37174a2b40d2d90aa6a0c7f778108687d39602.tar.xz
slixmpp-ed37174a2b40d2d90aa6a0c7f778108687d39602.zip
Always use OrderedDict from collections, and remove its implementation in slixmpp.thirdparty.
Diffstat (limited to 'slixmpp/thirdparty/__init__.py')
-rw-r--r--slixmpp/thirdparty/__init__.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/slixmpp/thirdparty/__init__.py b/slixmpp/thirdparty/__init__.py
index fd6b5f72..5caa28d3 100644
--- a/slixmpp/thirdparty/__init__.py
+++ b/slixmpp/thirdparty/__init__.py
@@ -1,9 +1,4 @@
try:
- from collections import OrderedDict
-except:
- from slixmpp.thirdparty.ordereddict import OrderedDict
-
-try:
from gnupg import GPG
except:
from slixmpp.thirdparty.gnupg import GPG