Made everything much more error resistant

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/help.py b/modules/help.py
index ed3e4d3..99f05a4 100644
--- a/modules/help.py
+++ b/modules/help.py
@@ -1,4 +1,4 @@
-from base import ModuleBase
+from . import ModuleBase
 import re
 
 class Module(ModuleBase):
@@ -12,8 +12,8 @@ class Module(ModuleBase):
         if not re.match(r'!help(?:\W|\Z)', text):
             return
         
-        commands = reduce(lambda l, mod: l + mod.commands(), self.manager.modules.itervalues(), [])
+        commands = self.manager.commands()
         helpstring = reduce(lambda s, (c, h): s + c + ': ' + h + '\n', commands, '')
-        helptexts = '\n'.join(reduce(lambda l, mod: l + mod.helptexts(), self.manager.modules.itervalues(), []))
+        helptexts = '\n'.join(self.manager.helptexts())
         
         handler.reply(('Befehle:\n' + helpstring + '\n' + helptexts).strip())