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 
						 
				 
			
				
					
						
							
							
								James McCoy 
							
						 
					 
					
						
						
						
						
							
						
						
							a483fef39d 
							
						 
					 
					
						
						
							
							RSS: Ensure results is declared before trying to access it  
						
						... 
						
						
						
						Signed-off-by: James McCoy <jamessan@users.sourceforge.net> 
						
						
					 
					
						2013-08-24 00:04:29 -04:00 
						 
				 
			
				
					
						
							
							
								Arnout Engelen 
							
						 
					 
					
						
						
						
						
							
						
						
							58e7e61d69 
							
						 
					 
					
						
						
							
							Only reset the cached feed when the response actually contains headlines  
						
						... 
						
						
						
						Some feeds, such as those from sourceforge.net, will sometimes show an error
page rather than a feed. In this case the feed cache used to be cleared for
that feed, causing all 'old' headlines to be flooded to the channel as soon
as the feed came back online.
This patch hopefully fixes that by only resetting the cache when the returned
page actually contains headlines.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net> 
						
						
					 
					
						2013-08-23 23:13:28 -04:00 
						 
				 
			
				
					
						
							
							
								Kill Your TV 
							
						 
					 
					
						
						
						
						
							
						
						
							b46a0dd6a2 
							
						 
					 
					
						
						
							
							Unicode fixes for python 2.x  
						
						... 
						
						
						
						These changes have been tested with Python 3.2.3 and Python 2.7.5. 
						
						
					 
					
						2013-08-17 14:12:10 +00:00 
						 
				 
			
				
					
						
							
							
								Kill Your TV 
							
						 
					 
					
						
						
						
						
							
						
						
							56c80e62f1 
							
						 
					 
					
						
						
							
							RSS: fix initialAnnounceHeadlines not being obeyed  
						
						
						
						
					 
					
						2013-08-15 22:32:19 +00:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							33a236079f 
							
						 
					 
					
						
						
							
							RSS: Fall back to decoding the headline with 'utf8' if 'ascii' failed.  
						
						
						
						
					 
					
						2013-07-31 09:33:03 +00:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							3341cd15ba 
							
						 
					 
					
						
						
							
							Admin & Factoids & Google & Later & Misc & NickAuth & RSS & Seen & User & Web: Update messages.pot  
						
						
						
						
					 
					
						2013-07-25 11:39:06 +02:00 
						 
				 
			
				
					
						
							
							
								Andrew Hampe 
							
						 
					 
					
						
						
						
						
							
						
						
							75723e7e8c 
							
						 
					 
					
						
						
							
							RSS: Remove b'' from around the RSS url.  
						
						
						
						
					 
					
						2013-07-18 13:13:36 -05:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							071b61061a 
							
						 
					 
					
						
						
							
							RSS: Honor configuration variable supybot.reply.format.url in announces. Closes GH-487.  
						
						
						
						
					 
					
						2013-07-18 10:11:02 +00:00 
						 
				 
			
				
					
						
							
							
								Daniel Folkinshteyn 
							
						 
					 
					
						
						
						
						
							
						
						
							c27070895b 
							
						 
					 
					
						
						
							
							RSS: add option display headline timestamp.  
						
						... 
						
						
						
						Conflicts:
	plugins/RSS/config.py
	plugins/RSS/plugin.py 
						
						
					 
					
						2013-06-27 07:06:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Folkinshteyn 
							
						 
					 
					
						
						
						
						
							
						
						
							e4ddda4aeb 
							
						 
					 
					
						
						
							
							RSS: add option to strip url redirects from headlines  
						
						... 
						
						
						
						Conflicts:
	plugins/RSS/config.py 
						
						
					 
					
						2013-06-27 07:03:57 +02:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							20bef2dcd0 
							
						 
					 
					
						
						
							
							RSS: keep track of headlines over multiple feed fetches, with configurable expiration.  
						
						... 
						
						
						
						This is better at avoiding repeats than just keeping the last fetch, since some feeds
shuffle items around (like google news search).
Conflicts:
	plugins/RSS/config.py 
						
						
					 
					
						2013-06-27 07:03:20 +02:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							863addd989 
							
						 
					 
					
						
						
							
							RSS: Add link to a patch to apply to feedparser.  
						
						
						
						
					 
					
						2013-05-29 15:21:56 +02:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							ad25f17639 
							
						 
					 
					
						
						
							
							RSS: Add Python 3 support.  
						
						
						
						
					 
					
						2013-05-29 15:16:23 +02:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							0537166502 
							
						 
					 
					
						
						
							
							RSS: Fix formating if newline character in an entry title. Closes GH-395.  
						
						
						
						
					 
					
						2013-05-22 14:03:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Folkinshteyn 
							
						 
					 
					
						
						
						
						
							
						
						
							af1931b3db 
							
						 
					 
					
						
						
							
							RSS: add option display headline timestamp.  
						
						
						
						
					 
					
						2013-05-05 11:23:15 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel Folkinshteyn 
							
						 
					 
					
						
						
						
						
							
						
						
							78659113c1 
							
						 
					 
					
						
						
							
							RSS: add option to strip url redirects from headlines  
						
						
						
						
					 
					
						2013-05-04 00:01:52 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel Folkinshteyn 
							
						 
					 
					
						
						
						
						
							
						
						
							bc0d16a4e1 
							
						 
					 
					
						
						
							
							RSS: keep track of headlines over multiple feed fetches, with configurable expiration.  
						
						... 
						
						
						
						This is better at avoiding repeats than just keeping the last fetch, since some feeds
shuffle items around (like google news search). 
						
						
					 
					
						2013-05-03 23:39:34 -04:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							61eb0fd3f8 
							
						 
					 
					
						
						
							
							RSS: add supybot.plugins.RSS.announcementSeparator.  
						
						
						
						
					 
					
						2013-04-06 16:57:30 +00:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							f880d5b6ef 
							
						 
					 
					
						
						
							
							RSS: Fix typo.  
						
						
						
						
					 
					
						2013-01-23 16:32:23 +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 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							6cbc6a14dd 
							
						 
					 
					
						
						
							
							Rename all 'locale' directories to 'locales'.  
						
						... 
						
						
						
						Firstly, these directories contains more than one locale. Secondly, it conflicts with the 'locale' python module. 
						
						
					 
					
						2012-12-26 15:43:35 +01:00 
						 
				 
			
				
					
						
							
							
								James McCoy 
							
						 
					 
					
						
						
						
						
							
						
						
							aa4071fa68 
							
						 
					 
					
						
						
							
							RSS: Remove local/feedparser and add it to install_requires  
						
						... 
						
						
						
						Signed-off-by: James McCoy <jamessan@users.sourceforge.net> 
						
						
					 
					
						2012-10-14 12:13:00 -04:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							5ebbf2d516 
							
						 
					 
					
						
						
							
							Merge branch 'debian' into testing  
						
						... 
						
						
						
						Conflicts:
	setup.py 
						
						
					 
					
						2012-10-12 19:56:43 +02: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 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							0c6320e9c1 
							
						 
					 
					
						
						
							
							RSS: Display error instead of traceback if fetching a feed failed.  
						
						
						
						
					 
					
						2012-08-26 07:38:40 +00:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							45bf9db03c 
							
						 
					 
					
						
						
							
							Merge branch 'py3k-backport' into testing  
						
						... 
						
						
						
						This branch provides support of Python 3 via 2to3 (without dropping
Python 2 support). 
						
						
					 
					
						2012-08-08 21:46:29 +02:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							242a54fbf2 
							
						 
					 
					
						
						
							
							Alias & RSS: remove third argument to types.MethodType.  
						
						... 
						
						
						
						It is useless in the case in point, and is not compatible with Python 3. 
						
						
					 
					
						2012-08-05 14:08:04 +02:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							11df697b96 
							
						 
					 
					
						
						
							
							RSS: Be compatible with new versions of feedparser.  
						
						
						
						
					 
					
						2012-08-04 20:43:11 +02:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							8b7d16c850 
							
						 
					 
					
						
						
							
							Alias & RSS: Use types.MethodType instead of new.instancemethod.  
						
						
						
						
					 
					
						2012-08-04 18:46:16 +02:00 
						 
				 
			
				
					
						
							
							
								Mika Suomalainen 
							
						 
					 
					
						
						
						
						
							
						
						
							3c3e615199 
							
						 
					 
					
						
						
							
							plugins/RSS/locale/fi.po: update headers.  
						
						
						
						
					 
					
						2012-08-04 15:09:45 +03:00 
						 
				 
			
				
					
						
							
							
								Mika Suomalainen 
							
						 
					 
					
						
						
						
						
							
						
						
							9760a44137 
							
						 
					 
					
						
						
							
							RSS: update l10n-fi  
						
						
						
						
					 
					
						2012-08-04 15:02:17 +03:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							59b9ba2cf8 
							
						 
					 
					
						
						
							
							RSS: Update l10n-fr.  
						
						
						
						
					 
					
						2012-07-31 21:12:37 +02:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							4bc5ed4f2d 
							
						 
					 
					
						
						
							
							RSS: Internationalize three strings.  
						
						
						
						
					 
					
						2012-07-31 19:09:18 +00:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							1bf8ab11c0 
							
						 
					 
					
						
						
							
							Google & Network & PluginDownloader & RSS & ShrinkUrl & Topic & Unix: Update l10n-fr.  
						
						
						
						
					 
					
						2012-07-29 12:05:42 +02:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							3ae2ce9483 
							
						 
					 
					
						
						
							
							Merge branch 'master' into debian  
						
						... 
						
						
						
						Conflicts:
	.gitignore
	src/version.py 
						
						
					 
					
						2012-06-23 17:44:06 +02:00 
						 
				 
			
				
					
						
							
							
								skizzhg 
							
						 
					 
					
						
						
						
						
							
						
						
							32eef54a65 
							
						 
					 
					
						
						
							
							RSS: Update l10n-it.  
						
						
						
						
					 
					
						2012-06-06 13:39:54 +02:00 
						 
				 
			
				
					
						
							
							
								Sebastian Kayser 
							
						 
					 
					
						
						
						
						
							
						
						
							2486be4464 
							
						 
					 
					
						
						
							
							RSS: sort and display feed items by date  
						
						
						
						
					 
					
						2012-05-28 19:32:24 +02:00 
						 
				 
			
				
					
						
							
							
								skizzhg 
							
						 
					 
					
						
						
						
						
							
						
						
							aedfc07762 
							
						 
					 
					
						
						
							
							Update l10n-it.  
						
						
						
						
					 
					
						2012-03-16 18:28:05 +01:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							46a890417a 
							
						 
					 
					
						
						
							
							Update all plugin .pot files.  
						
						
						
						
					 
					
						2012-03-11 21:06:19 +00:00 
						 
				 
			
				
					
						
							
							
								James McCoy 
							
						 
					 
					
						
						
						
						
							
						
						
							ff96b898f9 
							
						 
					 
					
						
						
							
							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>
Conflicts:
	plugins/RSS/plugin.py 
						
						
					 
					
						2011-12-19 01:32:05 +01:00 
						 
				 
			
				
					
						
							
							
								James McCoy 
							
						 
					 
					
						
						
						
						
							
						
						
							b42b06fe79 
							
						 
					 
					
						
						
							
							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>
(cherry picked from commit 964c73f591f7eafed94d7bcd6dd7b94dbb0afad5)
Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net> 
						
						
					 
					
						2011-12-12 11:04:03 -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 
						 
				 
			
				
					
						
							
							
								nyuszika7h 
							
						 
					 
					
						
						
						
						
							
						
						
							1c6ff67cee 
							
						 
					 
					
						
						
							
							RSS: Fix l10n-hu.  
						
						
						
						
					 
					
						2011-11-06 21:25:10 +08:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							8b616d2f59 
							
						 
					 
					
						
						
							
							RSS: update l10n-de l10n-fi l10n-it. fix l10n-fr.  
						
						
						
						
					 
					
						2011-10-29 17:10:58 +02:00 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							8add66511e 
							
						 
					 
					
						
						
							
							Update l10n-fr.  
						
						
						
						
					 
					
						2011-10-29 16:52:29 +02:00 
						 
				 
			
				
					
						
							
							
								Florian Besser 
							
						 
					 
					
						
						
						
						
							
						
						
							21b73bfbed 
							
						 
					 
					
						
						
							
							RSS: internationalized announcementPrefix default value  
						
						
						
						
					 
					
						2011-10-29 16:24:08 +02:00 
						 
				 
			
				
					
						
							
							
								Florian Besser 
							
						 
					 
					
						
						
						
						
							
						
						
							9ac667082f 
							
						 
					 
					
						
						
							
							RSS: Add l10n-de  
						
						
						
						
					 
					
						2011-10-29 10:38:17 +02: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 
						 
				 
			
				
					
						
							
							
								Valentin Lorentz 
							
						 
					 
					
						
						
						
						
							
						
						
							dda08e0648 
							
						 
					 
					
						
						
							
							RSS: Fix typo (fnor -> for).  
						
						
						
						
					 
					
						2011-08-27 13:58:14 +00:00