bug fixes for magic magic, and help magic

Calysto · Sep 13, 2014 · 2c91df1 · 2c91df1
1 parent 98d58ed
commit 2c91df1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/jupyter_kernel/magics/help_magic.py b/jupyter_kernel/magics/help_magic.py
@@ -8,23 +8,23 @@
 
 class HelpMagic(Magic):
 
-    def help_strings():
+    def help_strings(self):
         suffixes = [
-            "item{0}{0} - get detailed help on item",
-            "item{0} - get help on item",
+            "item{0}{0} - get detailed, technical information on item",
+            "item{0}  - get help on item",
         ]
         prefixes = [
-            "{0}{0}item - get detailed help on item",
-            "{0}item - get help on item",
+            "{0}{0}item - get detailed, technical information on item",
+            "{0}item  - get help on item",
         ]
         strings = []
-        if 'help' in self.kernel.suffixes:
-            strings += [s.format(self.kernel.suffixes['help'])
+        if 'help' in self.kernel.magic_suffixes:
+            strings += [s.format(self.kernel.magic_suffixes['help'])
                         for s in suffixes]
-        if 'help' in self.kernel.prefixes:
-            strings += [p.format(self.kernel.prefixes['help'])
+        if 'help' in self.kernel.magic_prefixes:
+            strings += [p.format(self.kernel.magic_prefixes['help'])
                         for p in prefixes]
-        return strings
+        return sorted(strings)
 
     def line_help(self, text):
         """

diff --git a/jupyter_kernel/magics/magic_magic.py b/jupyter_kernel/magics/magic_magic.py
@@ -7,7 +7,7 @@
 
 class MagicMagic(Magic):
 
-    def line_magic(self):
+    def line_magic(self, line):
         """
         %magic - show installed magics
 
@@ -19,9 +19,9 @@ def line_magic(self):
         cell_magics = []
 
         for (name, magic) in self.kernel.line_magics.items():
-            line_magics.append(magic.get_help('line', name))
+            line_magics.append(magic.get_help('line', name).split("\n")[0])
         for (name, magic) in self.kernel.cell_magics.items():
-            cell_magics.append(magic.get_help('cell', name))
+            cell_magics.append(magic.get_help('cell', name).split("\n")[0])
 
         prefixes = self.kernel.magic_prefixes
         line_magics = ("\n    ".join(sorted(line_magics)))