Restoring authorship annotation for Nikita Slyusarev <nslus@yandex-team.com>. Commit 1 of 2.

1 files changed, 8 insertions, 8 deletions

diff --git a/contrib/python/ipython/py2/IPython/core/magic.py b/contrib/python/ipython/py2/IPython/core/magic.py
index 61a929fd231..f3a0b5be336 100644
--- a/contrib/python/ipython/py2/IPython/core/magic.py
+++ b/contrib/python/ipython/py2/IPython/core/magic.py
@@ -27,8 +27,8 @@ from IPython.utils.ipstruct import Struct
 from IPython.utils.process import arg_split
 from IPython.utils.py3compat import string_types, iteritems
 from IPython.utils.text import dedent
-from traitlets import Bool, Dict, Instance, observe
-from logging import error
+from traitlets import Bool, Dict, Instance, observe 
+from logging import error 
 
 #-----------------------------------------------------------------------------
 # Globals
@@ -298,12 +298,12 @@ class MagicsManager(Configurable):
 
     shell = Instance('IPython.core.interactiveshell.InteractiveShellABC', allow_none=True)
 
-    auto_magic = Bool(True, help=
-        "Automatically call line magics without requiring explicit % prefix"
-    ).tag(config=True)
-    @observe('auto_magic')
-    def _auto_magic_changed(self, change):
-        self.shell.automagic = change['new']
+    auto_magic = Bool(True, help= 
+        "Automatically call line magics without requiring explicit % prefix" 
+    ).tag(config=True) 
+    @observe('auto_magic') 
+    def _auto_magic_changed(self, change): 
+        self.shell.automagic = change['new'] 
     
     _auto_status = [
         'Automagic is OFF, % prefix IS needed for line magics.',