Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-24 03:33:11 +01:00
Code Issues Projects Releases Wiki Activity

Try using simplejson instead if json-py is installed.

Browse Source 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 416a6e8dd2)
This commit is contained in:
Ricky Zhou 2009-06-03 02:55:40 -04:00 committed by James Vega
parent 8bb49e8873
commit 4eb30069bf
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/Google/plugin.py
View File

@ -42,15 +42,21 @@ import supybot.ircmsgs as ircmsgs
import supybot.ircutils as ircutils import supybot.ircutils as ircutils
import supybot.callbacks as callbacks import supybot.callbacks as callbacks
simplejson = None
try:
simplejson = utils.python.universalImport('json')
except ImportError:
pass
try: try:
simplejson = utils.python.universalImport('json', 'simplejson',
'local.simplejson')
# The 3rd party simplejson module was included in Python 2.6 and renamed to # The 3rd party simplejson module was included in Python 2.6 and renamed to
# json. Unfortunately, this conflicts with the 3rd party json module. # json. Unfortunately, this conflicts with the 3rd party json module.
# Luckily, the 3rd party json module has a different interface so we test # Luckily, the 3rd party json module has a different interface so we test
# to make sure we aren't using it. # to make sure we aren't using it.
if hasattr(simplejson, 'read'): if simplejson is None or hasattr(simplejson, 'read'):
raise ImportError simplejson = utils.python.universalImport('simplejson',
'local.simplejson')
except ImportError: except ImportError:
raise callbacks.Error, \ raise callbacks.Error, \
'You need Python2.6 or the simplejson module installed to use ' \ 'You need Python2.6 or the simplejson module installed to use ' \