Show More
@@ -1,7 +1,7 b'' | |||
|
1 | 1 | # -*- coding: utf-8 -*- |
|
2 | 2 | """Magic functions for InteractiveShell. |
|
3 | 3 | |
|
4 |
$Id: Magic.py 24 |
|
|
4 | $Id: Magic.py 2464 2007-06-27 23:03:07Z vivainio $""" | |
|
5 | 5 | |
|
6 | 6 | #***************************************************************************** |
|
7 | 7 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
@@ -58,6 +58,8 b' from IPython.ipstruct import Struct' | |||
|
58 | 58 | from IPython.macro import Macro |
|
59 | 59 | from IPython.genutils import * |
|
60 | 60 | from IPython import platutils |
|
61 | import IPython.generics | |
|
62 | import IPython.ipapi | |
|
61 | 63 | |
|
62 | 64 | #*************************************************************************** |
|
63 | 65 | # Utility functions |
@@ -528,6 +530,7 b' Currently the magic system has the following functions:\\n"""' | |||
|
528 | 530 | |
|
529 | 531 | #print 'pinfo par: <%s>' % parameter_s # dbg |
|
530 | 532 | |
|
533 | ||
|
531 | 534 | # detail_level: 0 -> obj? , 1 -> obj?? |
|
532 | 535 | detail_level = 0 |
|
533 | 536 | # We need to detect if we got called as 'pinfo pinfo foo', which can |
@@ -559,6 +562,11 b' Currently the magic system has the following functions:\\n"""' | |||
|
559 | 562 | info = Struct(self._ofind(oname, namespaces)) |
|
560 | 563 | |
|
561 | 564 | if info.found: |
|
565 | try: | |
|
566 | IPython.generics.inspect_object(info.obj) | |
|
567 | return | |
|
568 | except IPython.ipapi.TryNext: | |
|
569 | pass | |
|
562 | 570 | # Get the docstring of the class property if it exists. |
|
563 | 571 | path = oname.split('.') |
|
564 | 572 | root = '.'.join(path[:-1]) |
General Comments 0
You need to be logged in to leave comments.
Login now