Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

propagate automagic change to shell #3117

Merged
merged 1 commit into from

2 participants

@Carreau
Owner

Automagic toggling was broken.

this should fix it. Need to check for backport on 0.13.x

@minrk
Owner

I think this is a fine band-aid, especially for backporting, but the real fix will be to deprecate one or the other, and have this value only actually live in one place.

@minrk minrk merged commit fd8eb91 into ipython:master
@minrk minrk referenced this pull request from a commit
@minrk minrk Backport PR #3117: propagate automagic change to shell
Automagic toggling was broken.

this should fix it. Need to check for backport on 0.13.x
64d6e0d
@Carreau Carreau deleted the Carreau:fixautomagic branch
@yarikoptic yarikoptic referenced this pull request from a commit in yarikoptic/ipython
@yarikoptic yarikoptic Merge tag 'rel-0.13.2' into debian-01X
release 0.13.2

* tag 'rel-0.13.2': (65 commits)
  release 0.13.2
  add release date
  fix dot syntax error in inheritance diagram
  only upload sdists (backported from master)
  0.13.2 rc2
  update whatsnew
  Backport PR #3118: don't give up on weird os names
  Backport PR #3117: propagate automagic change to shell
  Backport PR #3097: PyQt 4.10: use self._document = self.document()
  note latest backports
  Backport PR #2224: fix css typo
  avoid references to fiel out of directory
  reimport HTML in different section
  add width:100% to vbox for webkit / FF consistency (0.13.2)
  0.13.2.rc1
  generate whatsnew for 0.13.2
  Backport PR #3008: fix cython module so extension for multiarched python
  Backport PR #3013: py3 workaround for reload in cythonmagic
  Backport PR #2831: avoid string version comparisons in external.qt
  Backport PR #2994: expanduser on %%file targets
  ...
cf253e7
@yarikoptic yarikoptic referenced this pull request from a commit in yarikoptic/ipython
@yarikoptic yarikoptic Merge tag 'rel-0.13.2' (mtheirs) into releases
release 0.13.2

* tag 'rel-0.13.2': (65 commits)
  release 0.13.2
  add release date
  fix dot syntax error in inheritance diagram
  only upload sdists (backported from master)
  0.13.2 rc2
  update whatsnew
  Backport PR #3118: don't give up on weird os names
  Backport PR #3117: propagate automagic change to shell
  Backport PR #3097: PyQt 4.10: use self._document = self.document()
  note latest backports
  Backport PR #2224: fix css typo
  avoid references to fiel out of directory
  reimport HTML in different section
  add width:100% to vbox for webkit / FF consistency (0.13.2)
  0.13.2.rc1
  generate whatsnew for 0.13.2
  Backport PR #3008: fix cython module so extension for multiarched python
  Backport PR #3013: py3 workaround for reload in cythonmagic
  Backport PR #2831: avoid string version comparisons in external.qt
  Backport PR #2994: expanduser on %%file targets
  ...
313b9f3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 30, 2013
  1. @Carreau
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 1 deletion.
  1. +1 −1  IPython/core/interactiveshell.py
  2. +3 −0  IPython/core/magic.py
View
2  IPython/core/interactiveshell.py
@@ -2042,7 +2042,7 @@ def set_completer_frame(self, frame=None):
def init_magics(self):
from IPython.core import magics as m
self.magics_manager = magic.MagicsManager(shell=self,
- confg=self.config,
+ config=self.config,
user_magics=m.UserMagics(self))
self.configurables.append(self.magics_manager)
View
3  IPython/core/magic.py
@@ -303,6 +303,9 @@ class MagicsManager(Configurable):
auto_magic = Bool(True, config=True, help=
"Automatically call line magics without requiring explicit % prefix")
+
+ def _auto_magic_changed(self, name, value):
+ self.shell.automagic = value
_auto_status = [
'Automagic is OFF, % prefix IS needed for line magics.',
Something went wrong with that request. Please try again.