Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct docstring of ipython.py #2859

Merged
merged 2 commits into from
Jan 28, 2013
Merged

Correct docstring of ipython.py #2859

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ce11b7
Correct docstring of ipython.py
asmeurer Jan 28, 2013
4c9aabb
setuptools has console_scripts, not distutils
asmeurer Jan 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions ipython.py
View file
Open in desktop
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'
))