Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-19 08:59:27 +01:00
Code Issues Projects Releases Wiki Activity
7,133 Commits 3 Branches 126 Tags 40 MiB
57e429011d
Commit Graph

3309 Commits

Author SHA1 Message Date
James McCoy
f3a09ce684 Success: Allow the plugin to be loaded from a query 
Closes: Sf#3513915
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-05-23 00:52:24 -04:00
Valentin Lorentz
b7bc11deea Prevent the 'hostmask' converter from returning '*!*@*' while 'foo!*@*' was given. 2012-05-22 23:10:40 -04:00
James McCoy
66ac089a53 Channel: Perform proper capability checks in devoice. 
Closes: Sf#3524393
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-05-20 20:57:13 -04:00
James McCoy
ca23cbb774 Merge branch 'maint/0.83.4' 2011-12-06 01:18:18 -05:00
James McCoy
c90fafebe7 Simplify handling of per-network waitingJoins 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2011-12-06 00:55:29 -05:00
Daniel Folkinshteyn
1e1b39783b Services: catch occasional error when removing waiting joins from list 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2011-12-06 00:53:19 -05:00
Daniel Folkinshteyn
d5648ab534 Services: fix problem with some channels being mixed up between networks on startup, when noJoinsUntilIdentified is true. 
When noJoinsUntilIdentified config is true, the bot holds join messages in a 'waitingJoins' list, and processes them
once nickserv identification comes through. The problem was that when the bot is configured to join multiple networks,
join messages from different networks would get appended to the same list, without any differentiation by which message
belongs to which network. Thus, if there are messages waiting for multiple networks, it would often be the case that
whichever network got identification done first, would 'pick up' other network's join messages.

This fix stores the network name along with the join messages in the list, and has each network pick out only its own
join messages.

Conflicts:

	src/version.py

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2011-12-06 00:53:07 -05:00
Daniel Folkinshteyn
71bcc2bc7c Services: add some more strings indicating identification success. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2011-12-06 00:38:29 -05:00
James McCoy
5b4c150d03 Prevent nesting of Misc.tell 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2011-12-05 23:13:09 -05:00
James McCoy
8b73f78b3e Merge branch 'maint/0.83.4' 
Conflicts:
	plugins/Misc/plugin.py
	src/ircutils.py

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2011-11-13 15:26:19 -05:00
James McCoy
c91916ae5e Misc: Avoid setting up "invalid command" flood handling if its not enabled 
Closes: Sf#3088554
Signed-off-by: James McCoy <vega.james@gmail.com>
 2011-10-29 17:53:35 -04:00
James McCoy
9b5019e79d Merge branch 'nick-access' into maint/0.83.4 2011-10-23 20:33:48 -04:00
James McCoy
755fe11982 Merge branch 'nick-access' 2011-10-23 20:33:41 -04:00
James McCoy
0869a8e271 Channel.nicks: Raise error so we don't actually reply with the nicks. 
Closes: Sf#3396388
Signed-off-by: James McCoy <vega.james@gmail.com>
 2011-10-23 20:26:39 -04:00
James McCoy
3c69fad3de Merge branch 'typos' into maint/0.83.4 2011-10-23 19:42:02 -04:00
James McCoy
9b855beec6 Merge branch 'typos' 2011-10-23 19:41:54 -04:00
Valentin Lorentz
a1a90f7673 NickCapture: Fix plugin help and l10n-fr. Closes GH-116. 
Conflicts:

	plugins/NickCapture/locale/fr.po
	plugins/NickCapture/messages.pot
	src/version.py

Signed-off-by: James McCoy <vega.james@gmail.com>
 2011-10-23 19:38:54 -04:00
Valentin Lorentz
f1690e6867 Topic: fix typo in @unlock help. 
Conflicts:

	plugins/Topic/locale/fr.po
	plugins/Topic/messages.pot
	src/version.py

Signed-off-by: James McCoy <vega.james@gmail.com>
 2011-10-23 19:36:46 -04:00
Valentin Lorentz
9561c9f417 Topic: Fix bad doctring 
Conflicts:

	plugins/Topic/messages.pot

Signed-off-by: James McCoy <vega.james@gmail.com>
 2011-10-23 19:36:08 -04:00
Valentin Lorentz
8fb4cbcdc6 Factoids: Fix typo. 
Conflicts:

	plugins/Factoids/locale/fi.po
	plugins/Factoids/locale/fr.po
	plugins/Factoids/messages.pot
	src/version.py

Signed-off-by: James McCoy <vega.james@gmail.com>
 2011-10-23 19:30:07 -04:00
Valentin Lorentz
8056da06f6 Channel: fix NameError: 'replyirc' -> 'replyIrc'. Closes GH-73. 
Conflicts:

	src/version.py

Signed-off-by: James McCoy <vega.james@gmail.com>
 2011-10-23 19:30:01 -04:00
Valentin Lorentz
fa8385596d Karma: fix typo. Closes GH-38. 
Conflicts:

	plugins/Karma/locale/fi.po
	plugins/Karma/locale/fr.po
	plugins/Karma/messages.pot

Signed-off-by: James McCoy <vega.james@gmail.com>
 2011-10-23 19:29:52 -04:00
Valentin Lorentz
70a6e6932d Protector: Fix variable name. 
Signed-off-by: James McCoy <vega.james@gmail.com>
 2011-10-23 19:04:12 -04:00
James McCoy
fb8f0741e7 Merge branch 'relay-nick-hostmask' into maint/0.83.4 2011-10-22 16:10:43 -04:00
James McCoy
05529e22a5 Merge branch 'relay-nick-hostmask' 2011-10-22 16:10:38 -04:00
Valentin Lorentz
ce4d26514b Relay: remove redundant nick on join/part when hostmasks enabled 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2011-10-22 16:10:23 -04:00
James McCoy
58eee3c995 Merge branch 'automode-conf' into maint/0.83.4 2011-10-22 16:06:57 -04:00
James McCoy
bab5bc671c Merge branch 'automode-conf' 2011-10-22 16:06:51 -04:00
Valentin Lorentz
5dcbe57fa3 AutoMode: fix bans. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2011-10-22 16:06:37 -04:00
James McCoy
d5593bbba2 Merge branch 'disable' 2011-10-22 15:52:44 -04:00
James McCoy
3db5727a9d Merge branch 'disable' into maint/0.83.4 2011-10-22 15:52:34 -04:00
Valentin Lorentz
8fb97c56bc Owner: Fix bug with @enable and @disable if a plugin is given. Closes GH-43. Closes GH-44. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2011-10-22 15:52:19 -04:00
James McCoy
964c73f591 RSS._getConverter: Encode strings before handing them off to other functions 
When the feed has a specified encoding, we'll be dealing with unicode objects
in the response from feedparser.parse().  To avoid possible UnicodeErrors, we
need to encode() before handing the string off to other functions, so the
other functions are always dealing with bytestrings instead of bytestrings and
unicode objects.  Mixing unicode and bytestrings will cause implicit
conversions of the unicode objects, which will most likely use the wrong
encoding.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2011-10-22 15:23:56 -04:00
James McCoy
01c8dc7f78 String.decode: Only encode('utf-8') when the decode string is unicode 
Closes: Sf#3165718
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2011-10-22 14:57:20 -04:00
James Vega
0cd4939678 Seen: Anchor nick regexp to ensure valid match. 
When searching for 'st*ke', 'stryker' would incorrectly match, 'stryke' would
be added to the nick set and the subsequent lookup would cause a KeyError.
This is fixed both by anchoring the regexp ('^st.*ke$' instead of 'st.*ke')
and adding searchNick to the nick set instead of the string that matched the
pattern.

Closes: Sf#3377381

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2011-08-02 22:19:47 -04:00
James Vega
44eb449ba4 Topic: Ensure do315's response is for a channel in our state object 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2011-08-01 17:17:22 -04:00
James Vega
b0e595fbd2 Update Internet.hexip to handle IPv6 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2011-06-06 22:29:21 -04:00
James Vega
d56381436c Update Internet.dns to handle IPv6 IPs and responses 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2011-06-06 22:28:35 -04:00
James Vega
cb48912db6 Services: Correct formatting of "isn't registered" log. 
Closes: Sf#3075937
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-10-03 14:58:38 -04:00
James Vega
26a458b9ec Merge branch 'maint/0.83.4' 2010-09-20 19:46:18 -04:00
James Vega
ca56575eb5 Unix: Use converter to enforce "no spaces" for spell's argument. 
Closes: Sf#3064304
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-20 19:44:01 -04:00
James Vega
074ded49e4 Use the plugin name for Owner.defaultplugin's error message. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-20 18:20:52 -04:00
James Vega
efdb2b44c1 Merge branch 'maint/0.83.4' 2010-09-09 00:02:18 -04:00
James Vega
154fbc30e9 Games: Re-add some, much higher, upper limits to dice. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-09 00:00:47 -04:00
James Vega
0abe22f5d1 Merge branch 'maint/0.83.4' 2010-09-08 23:50:35 -04:00
James Vega
45abdc8248 Karma: Refer to plugins.Karma.rankingDisplay in Karma.karma's help. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 23:44:40 -04:00
James Vega
b0575cec88 Handle changes to fnmatch.translate in Python 2.6 
Define utils.python.glob2re based on the Python version being used.
Use glob2re in Todo and Note plugins.

Closes: Sf#3059292
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 23:31:01 -04:00
James Vega
fc2a84fb90 <text> -> <thing> in Karma.karma's help 
Closes: Sf#3057517
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 22:43:45 -04:00
James Vega
c0e24cef30 Limiter: Fix "reduce limit" test case. 
Closes: Sf#3058142
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 22:42:07 -04:00
James Vega
c9274606ce Google: Remove Groups snarfer 
The regular expressions were woefully out of date and since there's not a
stable API (or any for that matter), keeping things working is a losing
battle.

Closes: Sf#3057485
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 22:20:23 -04:00
James Vega
7cf61ad046 Games: Remove arbitrary upper limits on dice command. 
Closes: Sf#3057255
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 21:35:22 -04:00
James Vega
63244b1e47 News: Use positiveInt converter instead of manual checks. 
Closes: Sf#3059239
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-05 01:09:43 -04:00
James Vega
8deb47eb53 Merge branch 'maint/0.83.4' 2010-08-31 19:01:37 -04:00
James Vega
8cc6320768 Channel: Correct specification of "#channel,op" capability. 
Closes: Sf#3055991
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-31 19:00:28 -04:00
James Vega
452c019b10 Filter: Rename _(un)code to _(morse|unMorse)code 
Closes: Sf#3056753
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-31 18:52:09 -04:00
James Vega
28839f8d00 Merge branch 'maint/0.83.4' 2010-08-31 18:47:09 -04:00
James Vega
bc98577fb1 Dict: Refer to the server config variable in Dict.dict's help. 
Closes: Sf#3056621
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-31 18:46:05 -04:00
James Vega
7d87d2f87a Merge branch 'maint/0.83.4' 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 11:34:55 -04:00
James Vega
577294f489 User: Handle DuplicateHostmask exception in hostmask.add. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 11:32:39 -04:00
James Vega
de726f90f3 User: Only require name for set.password when changing other user's password. 
Closes: Sf#3055358
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 11:32:23 -04:00
James Vega
f977a3a260 User: Require set.password be sent in private. 
Closes: Sf#3055365
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 11:03:41 -04:00
James Vega
07da8cab13 User: Specify chanagename must be used in private in its help. 
Closes: Sf#3055353
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 10:49:13 -04:00
James Vega
25b987cc58 Model Admin's ignore help after Channel's. 
Closes: Sf#3054919
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 10:26:59 -04:00
James Vega
0ff414b993 Services: Don't filter outgoing JOIN messages on disabled networks 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit acffde68ab)
 2010-08-24 19:52:22 -04:00
James Vega
3f63917dc2 Use conf.registerGlobalValue to ensure generated values are properly setup. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 0c62204809)
 2010-08-24 19:52:09 -04:00
James Vega
8c280369a6 Services: Properly register the NickServ.password group and child values. 
Closes: Sf#3019174

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit d78f7b6ac5)
 2010-08-24 19:51:51 -04:00
James Vega
0f877166ad Services: Fix conflict with callbacks.Commands.isDisabled 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit f926804f40)
 2010-08-24 19:51:09 -04:00
Daniel Folkinshteyn
abf6df9e13 fix google calc to work when doing a currency conversion. 
made the calcre more generic, so it finds stuff on both math and currency.
nothing a little exploration of google html page source couldn't solve.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 432228c736)
 2010-08-24 19:50:47 -04:00
Daniel Folkinshteyn
9e1ba9910a make Misc.apropos return plugin name even if command is in only one plugin. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 8daebd1240)
 2010-08-24 19:50:22 -04:00
James Vega
976567c1ac Services: Disable most of the plugin on networks in the disabled list. 
Notify the user when trying to use the commands on a disabled network, ignore
noJoinsUntilIdentified, and don't try communicating with services.

Closes: Sf#3018464

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 9e73f4482c)
 2010-08-24 19:50:11 -04:00
James Vega
246e09cc99 Anonymous: Implement support for allowPrivateTarget config. 
Closes: Sf#2991515

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 57e894de58)
 2010-08-24 19:49:14 -04:00
Daniel Folkinshteyn
e9d55d4bbd fix bug in RSS.announce.list: 
Because the 'channel' argument was declared optional, calling announce.list
off-channel without a channel argument caused an error.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 40941e044a)
 2010-08-24 19:48:42 -04:00
Daniel Folkinshteyn
fb8d0d320a fix alias bug https://sourceforge.net/tracker/?func=detail&aid=2987147&group_id=58965&atid=489447 
add tests for appropriate behavior

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 8d64d08645)
 2010-08-24 19:45:48 -04:00
James Vega
7869b962d1 Fix the previous Factoids fix. 
channel needs to be part of the args list.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit fe07ea1146)
 2010-08-24 19:44:56 -04:00
James Vega
b2c45caa66 Factoids: Pass channel to whatis when being called from search 
Thanks to Daniel Folkinshteyn for the fix.

Closes: Sf#2965589

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 209facd242)
 2010-08-24 19:44:45 -04:00
James Vega
be9128b3ec Internet: Use whois-servers.net for all whois lookups. 
rs.internic.net seems to be broken and using $tld.whois-servers.net looks to
be working for everything.

Also need to update the line termination string to use '\r\n' instead of '\n'
since some servers are strict about receiving the former.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 397cbbe0d3)
 2010-08-24 19:44:18 -04:00
James Vega
8d94ff743c Include hostmasks in JOIN, PART, QUIT logs. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 4a9596608a)
 2010-08-24 19:44:10 -04:00
James Vega
0933621dab Factoids: Prevent empty key or value when adding a factoid. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 10f5a12b7e)
 2010-08-24 19:43:56 -04:00
James Vega
455b5631bc Update plugins to ignore all non-ACTION CTCP messages. 
Also update commands.urlSnarfer to do the same, which allows us to revert
"Don't bother snarfing URLs from non-Action CTCP messages."

This reverts commit 3282e3407e.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 288d7c6e02)
 2010-08-24 19:42:11 -04:00
Jeremy Fincher
e2cafb2e3d Don't bother snarfing URLs from non-Action CTCP messages. 
(cherry picked from commit 3282e3407e)
 2010-08-24 19:41:49 -04:00
James Vega
f35e68cd65 Network: Properly parse WHOIS response 
The 319 message that indicates which channel(s) a user is in prefix the
channel name with the modes (@, +, !, etc.) applied to that user.  These need
to be stripped from the channel name before we feed it to
irc.state.channels.get(), otherwise when irc.state.channels.get() returns None
we assume the channel can't be private and leak information.
(cherry picked from commit 408ab6f88a)
 2010-08-24 19:41:30 -04:00
James Vega
afb4e1e07f Use 0 when no results are returned for Google.fight 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 3689460d0f)
 2010-08-24 19:40:54 -04:00
James Vega
a7c924b466 Switch from using the various popen flavors to subprocess.Popen 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit fbdc44ca52)
 2010-08-24 19:40:23 -04:00
James Vega
c53f8cd510 Rename Owner.log to Owner.logmark 
Since every plugin has a log method (to do actual logging), the log command
was conflicting with that.  The attempted workaround was overly complicated
and broken.  Simply renaming the command to logmark simplifies everything.

Closes Sf #2889709

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit acaa9b1fd6)
 2010-08-24 19:21:58 -04:00
James Vega
0bd9a8b6f4 Use the correct URLs for the PySqlite website. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 927c8c963a)
 2010-08-24 19:15:27 -04:00
James Vega
dcdbd5bea4 Update references to PySqlite URL 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit f475525237)
 2010-08-24 19:15:17 -04:00
James Vega
f0852a9e45 utils.web: Provide access to the raw httpUrlRe/urlRe strings 
Using the compiled regexps for a PluginRegexp method's __doc__ doesn't work.

Closes Sourceforge #2879862

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 25fc2de643)
 2010-08-24 19:14:58 -04:00
James Vega
bb4e09886a Use utils.web.httpUrlRe for the Web/ShrinkUrl snarfer regexes. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit ca917d3528)
 2010-08-24 19:14:36 -04:00
Benjamin P. Burhans
750fb2ccdc Check for empty word list in BadWords plugin before filtering. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 6418b3d8c3)
 2010-08-24 19:13:09 -04:00
Štěpán Němec
bc1c159d27 QuoteGrabs plugin: Add an `ungrab' command. 
Also add a missing error check in the `list' db method.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit e922918564)
 2010-08-24 19:09:43 -04:00
Štěpán Němec
4cc8fdecdc Note plugin: Fix erroneous use of __contributors__. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit a693162059)
 2010-08-24 19:03:27 -04:00
James Vega
6bebc383b4 ChannelStats.rank now starts from 1 instead of 0 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 169aee3bc0)
 2010-08-24 19:02:58 -04:00
James Vega
885d60a132 QuoteGrabs: QuoteGrabsRecord at arg needs to be an int. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit cbf68e53e3)
 2010-08-24 19:02:05 -04:00
James Vega
d43d083f44 User: getHostmasks should always return a string 
Since it was calling irc.reply() in one case, we had both that irc.reply being
sent and the irc.reply() of what getHostmasks returned (None in that case).
Bad!

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit dcb247494e)
 2010-08-24 19:01:55 -04:00
James Vega
965f4e79b8 User: Fix hostmask.list to show the user's name not the repr user object 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 9dccada152)
 2010-08-24 19:01:44 -04:00
James Vega
7aeedea6f6 Updated ChannelIdDatabasePlugin's getCommandHelp signature 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit c9329303d3)
 2010-08-24 19:01:26 -04:00
James Vega
26cefc78f4 Channel: alert should not require the caller to have op capability 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit ba29f0787c)
 2010-08-24 19:01:12 -04:00
James Vega
2b0b74dfe0 Google: Keep the list of supported languages in one place. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 461f943d97)
 2010-08-24 19:01:00 -04:00
James Vega
65a180798f QuoteGrabs: Fix incorrect argument order to _grab 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 874508867f)
 2010-08-24 19:00:34 -04:00
Ricky Zhou
4eb30069bf Try using simplejson instead if json-py is installed. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 416a6e8dd2)
 2010-08-24 19:00:14 -04:00