Skip to content

Commit

Permalink
Merge pull request ipython#848 from jenshnielsen/python3
Browse files Browse the repository at this point in the history
Python3 setup.py install failiure
  • Loading branch information
takluyver committed Oct 9, 2011
2 parents 2ade67a + f2f14bc commit 29e3e44
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions IPython/core/usage.py
Expand Up @@ -192,15 +192,15 @@
1. Auto-parentheses
Callable objects (i.e. functions, methods, etc) can be invoked like
this (notice the commas between the arguments):
>>> callable_ob arg1, arg2, arg3
In [1]: callable_ob arg1, arg2, arg3
and the input will be translated to this:
--> callable_ob(arg1, arg2, arg3)
------> callable_ob(arg1, arg2, arg3)
You can force auto-parentheses by using '/' as the first character
of a line. For example:
>>> /globals # becomes 'globals()'
In [1]: /globals # becomes 'globals()'
Note that the '/' MUST be the first character on the line! This
won't work:
>>> print /globals # syntax error
In [2]: print /globals # syntax error
In most cases the automatic algorithm should work, so you should
rarely need to explicitly invoke /. One notable exception is if you
Expand All @@ -220,16 +220,16 @@
2. Auto-Quoting
You can force auto-quoting of a function's arguments by using ',' as
the first character of a line. For example:
>>> ,my_function /home/me # becomes my_function("/home/me")
In [1]: ,my_function /home/me # becomes my_function("/home/me")
If you use ';' instead, the whole argument is quoted as a single
string (while ',' splits on whitespace):
>>> ,my_function a b c # becomes my_function("a","b","c")
>>> ;my_function a b c # becomes my_function("a b c")
In [2]: ,my_function a b c # becomes my_function("a","b","c")
In [3]: ;my_function a b c # becomes my_function("a b c")
Note that the ',' MUST be the first character on the line! This
won't work:
>>> x = ,my_function /home/me # syntax error
In [4]: x = ,my_function /home/me # syntax error
"""

interactive_usage_min = """\
Expand Down
2 changes: 1 addition & 1 deletion IPython/parallel/client/view.py
Expand Up @@ -786,7 +786,7 @@ class LoadBalancedView(View):
or targets can be specified, to restrict the potential destinations:
>>> v = client.client.load_balanced_view(([1,3])
>>> v = client.client.load_balanced_view([1,3])
which would restrict loadbalancing to between engines 1 and 3.
Expand Down

0 comments on commit 29e3e44

Please sign in to comment.