white space fixes, reformat; update url_blacklist

local_config.py.skel

@@ -34,8 +34,11 @@ config = {
 	'persistent_locked': False,
 
 	'url_blacklist': [
-		r'^.*heise\.de/[^/]+/meldung/.*$',
-		r'^.*wikipedia\.org/wiki/.*$'
+		r'^.*heise\.de/.*-[0-9]+\.html$',
+		r'^.*wikipedia\.org/wiki/.*$',
+		r'^.*blog\.fefe\.de/\?ts=[0-9a-f]+$',
+		r'^.*ibash\.de/zitat.*$',
+		r'^.*golem\.de/news/.*$'
 	],
 
 	# the "dice" feature will use more efficient random data (0) for given users

plugins.py

@@ -445,7 +445,7 @@ def command_cake(argv, **args):
 			"that you will be baked, and then there will be cake."),
 			"The cake is a lie!",
 			("This is your fault. I'm going to kill you. "
-			"And all the cake is gone. You don't even care, do you? "),
+			"And all the cake is gone. You don't even care, do you?"),
 			"Quit now and cake will be served immediately.",
 			("Enrichment Center regulations require both hands to be "
 			"empty before any cake..."),
@@ -569,9 +569,9 @@ def command_wp(argv,lang="de",**args):
 
 	if short is not None:
 		return {
-				'msg': args['reply_user'] + ': %s (<%s>)' % ( 
+			'msg': args['reply_user'] + ': %s (<%s>)' % (
 				short if short.strip() else "(nix)", link
-				)
+			)
 		}
 	elif "missing" in page:
 		return { 'msg': 'Article "%s" not found' % page.get("title", query) }
@@ -628,11 +628,13 @@ def data_parse_commands(msg_obj):
 		if not p.is_enabled:
 			continue
 
-		ret = p(data = data, 
-				cmd_list = [pl.plugin_name for pl in plugins[ptypes.COMMAND]],
-				reply_user = reply_user, 
-				msg_obj = msg_obj, 
-				argv = words[1:])
+		ret = p(
+			data = data,
+			cmd_list = [pl.plugin_name for pl in plugins[ptypes.COMMAND]],
+			reply_user = reply_user,
+			msg_obj = msg_obj,
+			argv = words[1:]
+		)
 
 
 		if None != ret: