##// END OF EJS Templates
Small fixes to get a cleaner doc build, and junk removal....
Fernando Perez -
Show More
@@ -3344,7 +3344,7 b' Defaulting color scheme to \'NoColor\'"""'
3344 3344
3345 3345 See also
3346 3346 --------
3347 %paste: automatically pull code from clipboard.
3347 paste: automatically pull code from clipboard.
3348 3348 """
3349 3349
3350 3350 opts,args = self.parse_options(parameter_s,'rs:',mode='string')
@@ -3383,7 +3383,7 b' Defaulting color scheme to \'NoColor\'"""'
3383 3383
3384 3384 See also
3385 3385 --------
3386 %cpaste: manually paste code into terminal until you mark its end.
3386 cpaste: manually paste code into terminal until you mark its end.
3387 3387 """
3388 3388 opts,args = self.parse_options(parameter_s,'r:',mode='string')
3389 3389 par = args.strip()
@@ -97,8 +97,8 b' class LineFrontEndBase(FrontEndBase):'
97 97 ----------
98 98 line : string
99 99
100 Result
101 ------
100 Returns
101 -------
102 102 The replacement for the line and the list of possible completions.
103 103 """
104 104 completions = self.shell.complete(line)
@@ -65,8 +65,8 b' class PrefilterFrontEnd(LineFrontEndBase):'
65 65 debug = False
66 66
67 67 def __init__(self, ipython0=None, argv=None, *args, **kwargs):
68 """ Parameters:
69 -----------
68 """ Parameters
69 ----------
70 70
71 71 ipython0: an optional ipython0 instance to use for command
72 72 prefiltering and completion.
@@ -891,8 +891,8 b' def doctest_reload():'
891 891 hard monkeypatch seems like a reasonable solution rather than asking
892 892 users to manually use a different doctest runner when under IPython.
893 893
894 Note
895 ----
894 Notes
895 -----
896 896
897 897 This function *used to* reload doctest, but this has been disabled because
898 898 reloading doctest unconditionally can cause massive breakage of other
@@ -932,8 +932,8 b' class InteractiveShell(object,Magic):'
932 932 Certain history lists are also initialized here, as they effectively
933 933 act as user namespaces.
934 934
935 Note
936 ----
935 Notes
936 -----
937 937 All data structures here are only filled in, they are NOT reset by this
938 938 method. If they were not empty before, data will simply be added to
939 939 therm.
@@ -1320,8 +1320,8 b' class InteractiveShell(object,Magic):'
1320 1320 def user_setup(self,ipythondir,rc_suffix,mode='install'):
1321 1321 """Install the user configuration directory.
1322 1322
1323 Note
1324 ----
1323 Notes
1324 -----
1325 1325 DEPRECATED: use the top-level user_setup() function instead.
1326 1326 """
1327 1327 return user_setup(ipythondir,rc_suffix,mode)
@@ -729,8 +729,8 b' class Interpreter(object):'
729 729 def error(self, text):
730 730 """ Pass an error message back to the shell.
731 731
732 Preconditions
733 -------------
732 Notes
733 -----
734 734 This should only be called when self.message is set. In other words,
735 735 when code is being executed.
736 736
@@ -21,8 +21,8 b' __test__ = {}'
21 21 class NotificationCenter(object):
22 22 """Synchronous notification center
23 23
24 Example
25 -------
24 Examples
25 --------
26 26 >>> import IPython.kernel.core.notification as notification
27 27 >>> def callback(theType, theSender, args={}):
28 28 ... print theType,theSender,args
@@ -47,10 +47,10 b' class NotificationCenter(object):'
47 47
48 48 def post_notification(self, theType, sender, **kwargs):
49 49 """Post notification (type,sender,**kwargs) to all registered
50 observers.
51
52 Implementation
53 --------------
50 observers.
51
52 Implementation notes:
53
54 54 * If no registered observers, performance is O(1).
55 55 * Notificaiton order is undefined.
56 56 * Notifications are posted synchronously.
@@ -122,4 +122,4 b' class NotificationCenter(object):'
122 122
123 123
124 124
125 sharedCenter = NotificationCenter() No newline at end of file
125 sharedCenter = NotificationCenter()
@@ -106,6 +106,9 b' def make_quoted_expr(s):'
106 106 def system_shell(cmd, verbose=False, debug=False, header=''):
107 107 """ Execute a command in the system shell; always return None.
108 108
109 This returns None so it can be conveniently used in interactive loops
110 without getting the return value (typically 0) printed many times.
111
109 112 Parameters
110 113 ----------
111 114 cmd : str
@@ -117,11 +120,6 b" def system_shell(cmd, verbose=False, debug=False, header=''):"
117 120 header : str
118 121 Header to print to screen prior to the executed command. No extra
119 122 newlines are added.
120
121 Description
122 -----------
123 This returns None so it can be conveniently used in interactive loops
124 without getting the return value (typically 0) printed many times.
125 123 """
126 124
127 125 if verbose or debug:
@@ -91,14 +91,13 b' class PendingResult(object):'
91 91
92 92 A user should not create a `PendingResult` instance by hand.
93 93
94 Methods
95 =======
94 Methods:
96 95
97 96 * `get_result`
98 97 * `add_callback`
99 98
100 Properties
101 ==========
99 Properties:
100
102 101 * `r`
103 102 """
104 103
@@ -414,7 +414,7 b' class ResultNS(object):'
414 414 This can be a bad idea, as it may corrupt standard behavior of the
415 415 ns object.
416 416
417 Example
417 Examples
418 418 --------
419 419
420 420 >>> ns = ResultNS({'a':17,'foo':range(3)})
@@ -10,9 +10,10 b' class C(object):'
10 10 pass
11 11 #print 'deleting object...' # dbg
12 12
13 c = C()
13 if __name__ == '__main__':
14 c = C()
14 15
15 c_refs = gc.get_referrers(c)
16 ref_ids = map(id,c_refs)
16 c_refs = gc.get_referrers(c)
17 ref_ids = map(id,c_refs)
17 18
18 print 'c referrers:',map(type,c_refs)
19 print 'c referrers:',map(type,c_refs)
@@ -38,7 +38,7 b' To use code that calls MPI, there are typically two things that MPI requires.'
38 38 There are a couple of ways that you can start the IPython engines and get these things to happen.
39 39
40 40 Automatic starting using :command:`mpiexec` and :command:`ipcluster`
41 -------------------------------------------------------------------
41 --------------------------------------------------------------------
42 42
43 43 The easiest approach is to use the `mpiexec` mode of :command:`ipcluster`, which will first start a controller and then a set of engines using :command:`mpiexec`::
44 44
@@ -48,7 +48,7 b' This approach is best as interrupting :command:`ipcluster` will automatically'
48 48 stop and clean up the controller and engines.
49 49
50 50 Manual starting using :command:`mpiexec`
51 ---------------------------------------
51 ----------------------------------------
52 52
53 53 If you want to start the IPython engines using the :command:`mpiexec`, just do::
54 54
@@ -154,4 +154,4 b' compiled C, C++ and Fortran libraries that have been exposed to Python.'
154 154 .. [MPI] Message Passing Interface. http://www-unix.mcs.anl.gov/mpi/
155 155 .. [mpi4py] MPI for Python. mpi4py: http://mpi4py.scipy.org/
156 156 .. [OpenMPI] Open MPI. http://www.open-mpi.org/
157 .. [PyTrilinos] PyTrilinos. http://trilinos.sandia.gov/packages/pytrilinos/ No newline at end of file
157 .. [PyTrilinos] PyTrilinos. http://trilinos.sandia.gov/packages/pytrilinos/
1 NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (800 lines changed) Show them Hide them
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now