Skip to content

Commit

Permalink
Merge pull request ipython#2859 from asmeurer/installed_script
Browse files Browse the repository at this point in the history
Correct docstring of ipython.py

had archaic reference to script location.

closes ipython#2858
  • Loading branch information
minrk committed Jan 28, 2013
2 parents d4ce2f7 + fcfe60a commit afb4a76
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions ipython.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
"""IPython -- An enhanced Interactive Python
The actual ipython script to be installed with 'python setup.py install' is
in './scripts' directory. This file is here (ipython source root directory)
to facilitate non-root 'zero-installation' (just copy the source tree
somewhere and run ipython.py) and development. """
generated by setuptool via the `console_scripts` mechanism. This file is here
(ipython source root directory) to facilitate non-root 'zero-installation'
(just copy the source tree somewhere and run ipython.py) and development.
"""

if __name__ != "__main__":
raise RuntimeError('You are trying to import the ipython.py executable. '
Expand All @@ -20,4 +22,3 @@
execfile(os.path.join(
this_dir, 'IPython', 'scripts', 'ipython'
))

0 comments on commit afb4a76

Please sign in to comment.