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.

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

Remove ipythonrc references from documentation #664

Merged
merged 4 commits into from Sep 3, 2011

Conversation

eteq
Copy link
Contributor

@eteq eteq commented Aug 2, 2011

This pull request should remove all references to the old-style ipythonrc from the ipython documentation and docstrings (except where it is intentionally referring to an old version).

Note that I've left everything in quarantine and deathrow untouched, as well as docs/source/config/old.txt .

There was one reference to setting aliases in ipythonrc that I simply deleted, as the new ipython_config.py file does not seem to mention aliases. If there's some way of adding aliases that isn't in the default ipython_config.py, I can easily add that in.

ipythonrc file, IPython's internal default is to do a case sensitive
search.
these options are given, the default is read from your configuration
file, with the option name 'wildcards_case_sensitive'. If this option
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably give the full option name, like InteractiveShell.wildcards_case_sensitive, assuming it still exists.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about that, but the problem is that it's different depending on which configuration file you're looking at - that is, in ipython_config.py it's TerminalInteractiveShell.wildcards_case_sensitive but in ipython_qtconsole_config.py it's ZMQInteractiveShell.wildcards_case_sensitive ... I could put both, but that seems a bit overly verbose. Alternatively, it could be (ShellClassName).wildcards_case_sensitive or something like that?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think they're both inheriting it from InteractiveShell, so changing it for InteractiveShell should change it for each subclass. The question of configuring them separately can probably be left for the config section.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes I just committed (eteq/ipython@25f147e) address this and adjust similar places to reference more precisely what class the option belongs to. Thanks for the suggestion!

@fperez
Copy link
Member

fperez commented Aug 16, 2011

@takluyver, I'll leave this one to you since you've already started working on it. Is it ready to merge? I'm just trying to flush the queue a little before euroscipy...

@@ -696,8 +697,7 @@ Even object attributes can be expanded::
System command aliases
----------------------

The %alias magic function and the alias option in the ipythonrc
configuration file allow you to define magic functions which are in fact
The %alias magic functionallows you to define magic functions which are in fact
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"functionallows" --> "function allows"

@takluyver
Copy link
Member

Just spotted a few more things. Also, I think we can lose the last section of docs/source/interactive/tips.txt (which is already commented out). If someone wants to update it, I think it's a better fit for the cookbook.

@eteq
Copy link
Contributor Author

eteq commented Aug 16, 2011

All 3 items should now be fixed.

One other thing that seems odd (although probably not for this pull request): despite the editor magic being present in ZMQInteractiveShell, there seems to be no editor variable associated with ZMQInteractiveShell (it's defined in TerminalInteractiveShell rather than InteractiveShell). I'm not sure if this is a problem as I haven't looked at the edit magic internals, but it seems a bit strange...

@takluyver
Copy link
Member

That's deliberate. The editor option is intended to be a terminal editor like vi or nano. It works a bit differently with ZMQ - it just sends the code to the frontend for editing. For the Qt console, there's an IPythonWidget.editor option to invoke a GUI editor.

@takluyver takluyver merged commit 00e96ae into ipython:master Sep 3, 2011
@takluyver
Copy link
Member

Thanks, @eteq - I've merged this in now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants