Commit Graph

83 Commits

Author SHA1 Message Date
Valentin Lorentz
5d301b653f Merge remote-tracking branch 'origin/speed-up-2to3' into testing
Conflicts:
	locales/fr.po
	plugins/Misc/plugin.py
	sandbox/check_trans.py
	src/i18n.py
2014-02-02 22:28:19 +01:00
Valentin Lorentz
06fdaa792f Continue accelerating the 2to3 step (remove fix_map). 2014-01-21 10:57:38 +01:00
Valentin Lorentz
2fda69b4d6 Continue accelerating the 2to3 step (remove fix_raise). 2014-01-20 15:43:55 +01:00
Valentin Lorentz
4652c9ce51 Start accelerating the 2to3 step (remove fix_apply, fix_buffer, fix_callable, fix_exec, fix_execfile, fix_exitfunc, fix_filter, fix_funcattrs, fix_future, fix_getcwdu, and fix_has_key). 2014-01-20 14:49:47 +01:00
Valentin Lorentz
5341df0254 Google: *copy* the utils.web.defaultHeaders before adding items to it. 2014-01-14 20:55:56 +00:00
spline
be2ad1f11f Google: Fix @calc. 2013-11-29 16:09:37 +01:00
Terje Hoås
599f80ec5f Google: Filter out [, before attempting to interpret Googles response as json. 2013-09-25 10:20:43 +02:00
Valentin Lorentz
40675ffdfa Merge remote-tracking branch 'supybot/master' into testing
Conflicts:
	plugins/Admin/plugin.py
	plugins/BadWords/config.py
	plugins/Filter/plugin.py
	plugins/Google/plugin.py
	plugins/Math/plugin.py
	plugins/Misc/plugin.py
	plugins/Note/plugin.py
	plugins/RSS/plugin.py
	plugins/Seen/test.py
	plugins/ShrinkUrl/config.py
	plugins/ShrinkUrl/plugin.py
	plugins/ShrinkUrl/test.py
	plugins/Status/plugin.py
	plugins/String/config.py
	plugins/String/plugin.py
	plugins/Time/plugin.py
	plugins/Todo/plugin.py
	plugins/Web/plugin.py
	plugins/__init__.py
	scripts/supybot-botchk
	setup.py
	src/__init__.py
	src/callbacks.py
	src/commands.py
	src/conf.py
	src/drivers/Socket.py
	src/ircdb.py
	src/irclib.py
	src/ircutils.py
	src/questions.py
	src/registry.py
	src/schedule.py
	src/test.py
	src/utils/file.py
	src/utils/gen.py
	src/utils/net.py
	src/utils/web.py
	src/world.py
2013-08-24 11:28:29 +02:00
Valentin Lorentz
2a8b8e78a0 Google: Fix URL quoting. 2013-07-19 09:11:08 +00:00
Valentin Lorentz
b360871378 Google: Fix previous commit. 2013-05-30 13:16:36 +00:00
Valentin Lorentz
6e8b7be0f1 Google: Fix @calc. 2013-05-30 13:13:19 +02:00
Valentin Lorentz
a15dea55db Google: Configurable base URL. Closes GH-64. 2013-05-21 18:40:38 +02:00
Valentin Lorentz
93ecc2424f Google: Fix encoding issue. 2013-05-13 14:18:22 +02:00
Valentin Lorentz
10fc03ab19 Google: Fix snarfer with Python 3. 2013-02-24 01:51:40 +01:00
Valentin Lorentz
5b432a781e Google: Restore @calc and @phonebook. 2013-02-03 07:53:55 +00:00
Valentin Lorentz
21c17b8248 Google: Fix Python 3 compatibility of the @translate command. 2013-02-01 17:12:03 +01:00
nyuszika7h
b2fdf83496 Google: Add translate command (needs testing)
https://github.com/myano/jenni/blob/master/modules/translate.py
is where I got the idea from. Say thanks to sbp and yano too! :)

Conflicts:
	plugins/Google/plugin.py
2013-02-01 14:54:13 +00:00
Valentin Lorentz
33048545ea Revert "Google: Remove translate command since their API is gone"
This reverts commit 304facd167.

Conflicts:
	plugins/Google/test.py
2013-02-01 14:49:53 +00:00
Valentin Lorentz
7e0d868db1 Merge branch 'py3k-backport' into testing 2013-01-06 16:46:29 +01:00
Valentin Lorentz
df62ddad78 Google: Fix encoding with Python 3. 2013-01-06 16:46:21 +01:00
Valentin Lorentz
3dba9088b0 Merge remote-tracking branch 'supybot/master' into testing
Conflicts:
	INSTALL
	plugins/ChannelLogger/README.txt
	plugins/ChannelStats/README.txt
	plugins/Google/plugin.py
	plugins/Google/test.py
	plugins/Plugin/test.py
	plugins/Web/test.py
	setup.py
	src/callbacks.py
	src/ircdb.py
	src/irclib.py
	src/utils/str.py
	test/test_irclib.py
2013-01-01 21:11:24 +01:00
James McCoy
748b76404f Google: Use standard json module now that 2.6 is minimum Python version
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2012-09-10 20:07:43 -04:00
James McCoy
6f925e5f7a Google: Remove calc and phonebook commands
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2012-09-05 23:04:10 -04:00
James McCoy
304facd167 Google: Remove translate command since their API is gone
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2012-09-05 22:51:11 -04:00
James McCoy
82ecf36fcd Update my name/contact information
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2012-09-01 10:16:48 -04:00
nyuszika7h
de61bb6b93 Google: Add translate command (needs testing)
https://github.com/myano/jenni/blob/master/modules/translate.py
is where I got the idea from. Say thanks to sbp and yano too! :)
2012-08-31 16:52:58 +02:00
Valentin Lorentz
30f711b12f Google: Prevent flooding when no matches are found. 2012-08-26 07:37:40 +00:00
Terje Hoås
e1adc011c3 Google: Stop output when there are no result. 2012-08-17 17:16:26 +02:00
Valentin Lorentz
978a702346 Google: Use 'json' module and apply .decode() on data. 2012-08-04 19:50:30 +02:00
Valentin Lorentz
d5f3e1844f Google: Add supybot.plugins.Google.oneToOne. 2012-07-30 14:57:52 +00:00
Terje Hoås
e19ff328b6 Google: Fix currency conversions. 2012-07-13 19:05:21 +02:00
Valentin Lorentz
4692f831d4 Google: Fix HTML escaping. 2012-05-11 18:07:50 +02:00
nyuszika7h
d23757e8fa Google: Remove translate command. Closes GH-337. 2012-05-05 20:45:01 +02:00
Valentin Lorentz
207f6ec2da Google: Fix bad json format. 2012-05-02 15:36:34 +00:00
Terje Hoås
a1ab4b7ba0 Google: Fix UnicodeEncodeError in Calc. 2012-03-08 14:24:58 +01:00
Valentin Lorentz
72077c8c97 Google: fix previous cherry-pick. 2011-12-13 18:10:20 +01:00
Daniel Folkinshteyn
b991c8679b Google: use web scraping as fallback to ig api
ig api doesn't have everything (for one, timezones),
and also, in case the IG api ever dies.

Conflicts:

	plugins/Google/plugin.py
2011-12-13 18:10:15 +01:00
Daniel Folkinshteyn
e1ffe0f4e3 Google: use google ig api for the calc. no more web scraping. let's hope this stays alive.
Conflicts:

	plugins/Google/plugin.py
2011-12-13 18:10:09 +01:00
Valentin Lorentz
cf8126223b Google: Apply gholms's patch to fix @calc match. 2011-11-09 10:04:53 +01:00
Valentin Lorentz
8595c177dd Google: fix @calc 2011-03-07 18:20:10 +01:00
Daniel Folkinshteyn
8e80e7b657 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.
2011-02-25 19:24:04 +01:00
Daniel Folkinshteyn
bf6f0e2d18 make google translate return detailed google error, instead of the unhelpful "we broke google". 2011-02-25 18:56:56 +01:00
Daniel Folkinshteyn
8d45228642 for google translate, error if destination language is 'auto'. 2011-02-25 18:56:50 +01:00
Daniel Folkinshteyn
bdc8fd5285 fix some encoding error for non-ascii langs 2011-02-25 18:36:00 +01:00
Daniel Folkinshteyn
ca045128d7 add detected source language display for 'auto' google translate, add test for auto translate. 2011-02-25 18:35:53 +01:00
Daniel Folkinshteyn
6b324674a7 enable google translate to autodetect language with 'auto' fromlang. 2011-02-25 18:35:44 +01:00
Daniel Folkinshteyn
a6b9d5fe5f Google: fix encoding bug in lucky --snippet; need to pass encoded string to utils.web.htmlToText 2011-02-14 18:27:40 +01:00
Daniel Folkinshteyn
614e6c3f43 Google: in lucky --snippet, properly convert html to text, using utils.web.htmlToText. 2011-02-14 18:27:26 +01:00
Daniel Folkinshteyn
33c6eabf82 Google: add --snippet option to lucky command, which shows the text snippet for the page. 2011-02-14 18:26:50 +01:00
Daniel Folkinshteyn
7c7b093b33 Google: add some extra matching capability to google calc
now should be able to display any 'special' result from google.
2011-01-29 11:39:59 +01:00