Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1096 from bfroehle/1094

Show constructor docstrings in notebook tooltip.

Closes #1094.
  • Loading branch information...
commit 9a36fc89bbaa232040e3c81654dd0d02518d5f59 2 parents c5e6514 + c6bcbb5
@fperez fperez authored
Showing with 10 additions and 3 deletions.
  1. +10 −3 IPython/frontend/html/notebook/static/js/codecell.js
View
13 IPython/frontend/html/notebook/static/js/codecell.js
@@ -162,9 +162,16 @@ var IPython = (function (IPython) {
}
CodeCell.prototype.finish_tooltip = function (reply) {
- defstring=reply.definition;
- docstring=reply.docstring;
- if(docstring == null){docstring="<empty docstring>"};
+ // Extract call tip data; the priority is call, init, main.
+ defstring = reply.call_def;
+ if (defstring == null) { defstring = reply.init_definition; }
+ if (defstring == null) { defstring = reply.definition; }
+
+ docstring = reply.call_docstring;
+ if (docstring == null) { docstring = reply.init_docstring; }
+ if (docstring == null) { docstring = reply.docstring; }
+ if (docstring == null) { docstring = "<empty docstring>"; }
+
name=reply.name;
var that = this;
Please sign in to comment.
Something went wrong with that request. Please try again.