slixmpp/sleekxmpp/thirdparty/__init__.py
Lance Stout 06a9d9fc30 Merge branch 'master' into develop
Conflicts:
	sleekxmpp/thirdparty/__init__.py
2012-07-31 21:33:19 -07:00

12 lines
315 B
Python

try:
from collections import OrderedDict
except:
from sleekxmpp.thirdparty.ordereddict import OrderedDict
try:
from gnupg import GPG
except:
from sleekxmpp.thirdparty.gnupg import GPG
from sleekxmpp.thirdparty import socks
from sleekxmpp.thirdparty.mini_dateutil import tzutc, tzoffset, parse_iso