sleduc

diff --git a/xhtml/__init__.py b/xhtml/__init__.py
index 9310d47..645a31a 100644
--- a/xhtml/__init__.py
+++ b/xhtml/__init__.py
@@ -17,6 +17,6 @@ class CmdXhtml(SyncModule):
     @defaultcmd
     def answer(self, sender, message):
         d = {}
-        d["text"] = message
-        d["xhtml"] = pipobot.lib.utils.xhtml2text(message)

sleduc

--- tools.py    2015-11-12 18:46:13.489194658 +0100
+++ tools.new.py        2015-11-12 18:45:35.178614760 +0100
@@ -239,8 +239,8 @@ def message_if_missing(filename):
   return _CLIENT_SECRETS_MESSAGE % filename
 
 try:
-  from oauth2client.old_run import run
-  from oauth2client.old_run import FLAGS
+  from oauth2client1412.old_run import run
+  from oauth2client1412.old_run import FLAGS

sleduc

diff --git a/pavement.py b/pavement.py
index 6c82dca..83ed39d 100644
--- a/pavement.py
+++ b/pavement.py
@@ -25,7 +25,7 @@ options = environment.options
 # guessit 0.10.4 stops supporting python 2.6, the tests also start failing on 2.7
 # Path keeps messing about with case, so anything under 6.2 will be broken now
 install_requires = ['FeedParser>=5.1.3', 'SQLAlchemy >=0.7.5, !=0.9.0, <1.999', 'PyYAML',
-                    'beautifulsoup4>=4.1, !=4.2.0, <4.4', 'html5lib>=0.11', 'PyRSS2Gen', 'pynzb', 'progressbar', 'rpyc',
+                    'beautifulsoup4>=4.1, !=4.2.0', 'html5lib>=0.11', 'PyRSS2Gen', 'pynzb', 'progressbar', 'rpyc',

sleduc

diff --git a/pipobot/lib/loader.py b/pipobot/lib/loader.py
index 40d00b2..7c629a2 100644
--- a/pipobot/lib/loader.py
+++ b/pipobot/lib/loader.py
@@ -88,12 +88,20 @@ class BotModuleLoader(object):
     def set_post_hook(self, module_obj, module_name):
         if module_name in self._module_settings and \
            "post_hook" in self._module_settings[module_name]:
-            func_path = self._module_settings[module_name]["post_hook"]
+            hook = self._module_settings[module_name]["post_hook"]

sleduc

diff --git a/pipobot/lib/loader.py b/pipobot/lib/loader.py
index 40d00b2..0ac110d 100644
--- a/pipobot/lib/loader.py
+++ b/pipobot/lib/loader.py
@@ -97,6 +97,14 @@ class BotModuleLoader(object):
             except (AttributeError, ImportError):
                 logger.error("Error trying to import post_hook %s for module %s", func_path, module_name)
 
+    def set_flood_level(self, module_obj, module_name):
+        if module_name in self._module_settings and \