Restoring authorship annotation for <[email protected]>. Commit 2 of 2.

12 files changed, 480 insertions, 480 deletions

diff --git a/contrib/python/ipython/py2/.dist-info/METADATA b/contrib/python/ipython/py2/.dist-info/METADATA
index 46513c738c2..758e567f250 100644
--- a/contrib/python/ipython/py2/.dist-info/METADATA
+++ b/contrib/python/ipython/py2/.dist-info/METADATA
@@ -1,113 +1,113 @@
-Metadata-Version: 2.1 
-Name: ipython 
-Version: 5.9.0 
-Summary: IPython: Productive Interactive Computing 
-Home-page: https://ipython.org 
-Author: The IPython Development Team 
-Author-email: [email protected] 
-License: BSD 
-Keywords: Interactive,Interpreter,Shell,Embedding 
-Platform: Linux 
-Platform: Mac OSX 
-Platform: Windows 
-Classifier: Framework :: IPython 
-Classifier: Intended Audience :: Developers 
-Classifier: Intended Audience :: Science/Research 
-Classifier: License :: OSI Approved :: BSD License 
-Classifier: Programming Language :: Python 
-Classifier: Programming Language :: Python :: 2 
-Classifier: Programming Language :: Python :: 2.7 
-Classifier: Programming Language :: Python :: 3 
-Classifier: Topic :: System :: Shells 
-Requires-Dist: setuptools (>=18.5) 
-Requires-Dist: decorator 
-Requires-Dist: pickleshare 
-Requires-Dist: simplegeneric (>0.8) 
-Requires-Dist: traitlets (>=4.2) 
-Requires-Dist: prompt-toolkit (<2.0.0,>=1.0.4) 
-Requires-Dist: pygments 
-Requires-Dist: backports.shutil-get-terminal-size ; python_version == "2.7" 
-Requires-Dist: pathlib2 ; python_version == "2.7" or python_version == "3.3" 
-Requires-Dist: pexpect ; sys_platform != "win32" 
-Requires-Dist: appnope ; sys_platform == "darwin" 
-Requires-Dist: colorama ; sys_platform == "win32" 
-Requires-Dist: win-unicode-console (>=0.5) ; sys_platform == "win32" and python_version < "3.6" 
-Provides-Extra: all 
-Requires-Dist: ipyparallel ; extra == 'all' 
-Requires-Dist: requests ; extra == 'all' 
-Requires-Dist: nbformat ; extra == 'all' 
-Requires-Dist: notebook ; extra == 'all' 
-Requires-Dist: qtconsole ; extra == 'all' 
-Requires-Dist: ipywidgets ; extra == 'all' 
-Requires-Dist: ipykernel ; extra == 'all' 
-Requires-Dist: nose (>=0.10.1) ; extra == 'all' 
-Requires-Dist: nbconvert ; extra == 'all' 
-Requires-Dist: testpath ; extra == 'all' 
-Requires-Dist: Sphinx (>=1.3) ; extra == 'all' 
-Requires-Dist: pygments ; extra == 'all' 
-Provides-Extra: doc 
-Requires-Dist: Sphinx (>=1.3) ; extra == 'doc' 
-Provides-Extra: kernel 
-Requires-Dist: ipykernel ; extra == 'kernel' 
-Provides-Extra: nbconvert 
-Requires-Dist: nbconvert ; extra == 'nbconvert' 
-Provides-Extra: nbformat 
-Requires-Dist: nbformat ; extra == 'nbformat' 
-Provides-Extra: notebook 
-Requires-Dist: notebook ; extra == 'notebook' 
-Requires-Dist: ipywidgets ; extra == 'notebook' 
-Provides-Extra: parallel 
-Requires-Dist: ipyparallel ; extra == 'parallel' 
-Provides-Extra: qtconsole 
-Requires-Dist: qtconsole ; extra == 'qtconsole' 
-Provides-Extra: terminal 
-Provides-Extra: test 
-Requires-Dist: nose (>=0.10.1) ; extra == 'test' 
-Requires-Dist: requests ; extra == 'test' 
-Requires-Dist: testpath ; extra == 'test' 
-Requires-Dist: pygments ; extra == 'test' 
-Requires-Dist: nbformat ; extra == 'test' 
-Requires-Dist: ipykernel ; extra == 'test' 
-Requires-Dist: mock ; (python_version == "2.7") and extra == 'test' 
-Requires-Dist: numpy ; (python_version >= "3.4") and extra == 'test' 
- 
- 
-IPython provides a rich toolkit to help you make the most out of using Python 
-interactively.  Its main components are: 
- 
-* A powerful interactive Python shell 
-* A `Jupyter <http://jupyter.org/>`_ kernel to work with Python code in Jupyter 
-  notebooks and other interactive frontends. 
- 
-The enhanced interactive Python shells have the following main features: 
- 
-* Comprehensive object introspection. 
- 
-* Input history, persistent across sessions. 
- 
-* Caching of output results during a session with automatically generated 
-  references. 
- 
-* Extensible tab completion, with support by default for completion of python 
-  variables and keywords, filenames and function keywords. 
- 
-* Extensible system of 'magic' commands for controlling the environment and 
-  performing many tasks related either to IPython or the operating system. 
- 
-* A rich configuration system with easy switching between different setups 
-  (simpler than changing $PYTHONSTARTUP environment variables every time). 
- 
-* Session logging and reloading. 
- 
-* Extensible syntax processing for special purpose situations. 
- 
-* Access to the system shell with user-extensible alias system. 
- 
-* Easily embeddable in other Python programs and GUIs. 
- 
-* Integrated access to the pdb debugger and the Python profiler. 
- 
-The latest development version is always available from IPython's `GitHub 
-site <http://github.com/ipython>`_. 
- 
- 
+Metadata-Version: 2.1
+Name: ipython
+Version: 5.9.0
+Summary: IPython: Productive Interactive Computing
+Home-page: https://ipython.org
+Author: The IPython Development Team
+Author-email: [email protected]
+License: BSD
+Keywords: Interactive,Interpreter,Shell,Embedding
+Platform: Linux
+Platform: Mac OSX
+Platform: Windows
+Classifier: Framework :: IPython
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: System :: Shells
+Requires-Dist: setuptools (>=18.5)
+Requires-Dist: decorator
+Requires-Dist: pickleshare
+Requires-Dist: simplegeneric (>0.8)
+Requires-Dist: traitlets (>=4.2)
+Requires-Dist: prompt-toolkit (<2.0.0,>=1.0.4)
+Requires-Dist: pygments
+Requires-Dist: backports.shutil-get-terminal-size ; python_version == "2.7"
+Requires-Dist: pathlib2 ; python_version == "2.7" or python_version == "3.3"
+Requires-Dist: pexpect ; sys_platform != "win32"
+Requires-Dist: appnope ; sys_platform == "darwin"
+Requires-Dist: colorama ; sys_platform == "win32"
+Requires-Dist: win-unicode-console (>=0.5) ; sys_platform == "win32" and python_version < "3.6"
+Provides-Extra: all
+Requires-Dist: ipyparallel ; extra == 'all'
+Requires-Dist: requests ; extra == 'all'
+Requires-Dist: nbformat ; extra == 'all'
+Requires-Dist: notebook ; extra == 'all'
+Requires-Dist: qtconsole ; extra == 'all'
+Requires-Dist: ipywidgets ; extra == 'all'
+Requires-Dist: ipykernel ; extra == 'all'
+Requires-Dist: nose (>=0.10.1) ; extra == 'all'
+Requires-Dist: nbconvert ; extra == 'all'
+Requires-Dist: testpath ; extra == 'all'
+Requires-Dist: Sphinx (>=1.3) ; extra == 'all'
+Requires-Dist: pygments ; extra == 'all'
+Provides-Extra: doc
+Requires-Dist: Sphinx (>=1.3) ; extra == 'doc'
+Provides-Extra: kernel
+Requires-Dist: ipykernel ; extra == 'kernel'
+Provides-Extra: nbconvert
+Requires-Dist: nbconvert ; extra == 'nbconvert'
+Provides-Extra: nbformat
+Requires-Dist: nbformat ; extra == 'nbformat'
+Provides-Extra: notebook
+Requires-Dist: notebook ; extra == 'notebook'
+Requires-Dist: ipywidgets ; extra == 'notebook'
+Provides-Extra: parallel
+Requires-Dist: ipyparallel ; extra == 'parallel'
+Provides-Extra: qtconsole
+Requires-Dist: qtconsole ; extra == 'qtconsole'
+Provides-Extra: terminal
+Provides-Extra: test
+Requires-Dist: nose (>=0.10.1) ; extra == 'test'
+Requires-Dist: requests ; extra == 'test'
+Requires-Dist: testpath ; extra == 'test'
+Requires-Dist: pygments ; extra == 'test'
+Requires-Dist: nbformat ; extra == 'test'
+Requires-Dist: ipykernel ; extra == 'test'
+Requires-Dist: mock ; (python_version == "2.7") and extra == 'test'
+Requires-Dist: numpy ; (python_version >= "3.4") and extra == 'test'
+
+
+IPython provides a rich toolkit to help you make the most out of using Python
+interactively.  Its main components are:
+
+* A powerful interactive Python shell
+* A `Jupyter <http://jupyter.org/>`_ kernel to work with Python code in Jupyter
+  notebooks and other interactive frontends.
+
+The enhanced interactive Python shells have the following main features:
+
+* Comprehensive object introspection.
+
+* Input history, persistent across sessions.
+
+* Caching of output results during a session with automatically generated
+  references.
+
+* Extensible tab completion, with support by default for completion of python
+  variables and keywords, filenames and function keywords.
+
+* Extensible system of 'magic' commands for controlling the environment and
+  performing many tasks related either to IPython or the operating system.
+
+* A rich configuration system with easy switching between different setups
+  (simpler than changing $PYTHONSTARTUP environment variables every time).
+
+* Session logging and reloading.
+
+* Extensible syntax processing for special purpose situations.
+
+* Access to the system shell with user-extensible alias system.
+
+* Easily embeddable in other Python programs and GUIs.
+
+* Integrated access to the pdb debugger and the Python profiler.
+
+The latest development version is always available from IPython's `GitHub
+site <http://github.com/ipython>`_.
+
+
diff --git a/contrib/python/ipython/py2/.dist-info/entry_points.txt b/contrib/python/ipython/py2/.dist-info/entry_points.txt
index 5adb0a05b1a..7795cb412ab 100644
--- a/contrib/python/ipython/py2/.dist-info/entry_points.txt
+++ b/contrib/python/ipython/py2/.dist-info/entry_points.txt
@@ -1,11 +1,11 @@
-[console_scripts] 
-iptest = IPython.testing.iptestcontroller:main 
-iptest3 = IPython.testing.iptestcontroller:main 
-ipython = IPython:start_ipython 
-ipython3 = IPython:start_ipython 
- 
-[pygments.lexers] 
-ipython = IPython.lib.lexers:IPythonLexer 
-ipython3 = IPython.lib.lexers:IPython3Lexer 
-ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer 
- 
+[console_scripts]
+iptest = IPython.testing.iptestcontroller:main
+iptest3 = IPython.testing.iptestcontroller:main
+ipython = IPython:start_ipython
+ipython3 = IPython:start_ipython
+
+[pygments.lexers]
+ipython = IPython.lib.lexers:IPythonLexer
+ipython3 = IPython.lib.lexers:IPython3Lexer
+ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer
+
diff --git a/contrib/python/ipython/py2/.dist-info/top_level.txt b/contrib/python/ipython/py2/.dist-info/top_level.txt
index c1dcdea3bbe..7fed997b4c4 100644
--- a/contrib/python/ipython/py2/.dist-info/top_level.txt
+++ b/contrib/python/ipython/py2/.dist-info/top_level.txt
@@ -1 +1 @@
-IPython 
+IPython
diff --git a/contrib/python/ipython/py2/IPython/core/completerlib.py b/contrib/python/ipython/py2/IPython/core/completerlib.py
index d31357d0e11..e736ca73d10 100644
--- a/contrib/python/ipython/py2/IPython/core/completerlib.py
+++ b/contrib/python/ipython/py2/IPython/core/completerlib.py
@@ -19,7 +19,7 @@ from __future__ import print_function
 # Stdlib imports
 import glob
 import inspect
-import itertools 
+import itertools
 import os
 import re
 import sys
@@ -45,8 +45,8 @@ from IPython.utils.py3compat import string_types
 # FIXME: this should be pulled in with the right call via the component system
 from IPython import get_ipython
 
-from __res import importer 
- 
+from __res import importer
+
 #-----------------------------------------------------------------------------
 # Globals and constants
 #-----------------------------------------------------------------------------
@@ -71,51 +71,51 @@ magic_run_re = re.compile(r'.*(\.ipy|\.ipynb|\.py[w]?)$')
 # Local utilities
 #-----------------------------------------------------------------------------
 
-arcadia_rootmodules_cache = None 
-arcadia_modules_cache = None 
- 
- 
-def arcadia_init_cache(): 
-    global arcadia_rootmodules_cache, arcadia_modules_cache 
-    arcadia_rootmodules_cache = set() 
-    arcadia_modules_cache = {} 
- 
-    all_modules = itertools.chain( 
-        sys.builtin_module_names, 
-        importer.memory 
-    ) 
- 
-    for name in all_modules: 
-        path = name.split('.') 
-        arcadia_rootmodules_cache.add(path[0]) 
- 
-        prefix = path[0] 
-        for element in path[1:]: 
-            if element == '__init__': 
-                continue 
- 
-            arcadia_modules_cache.setdefault(prefix, set()).add(element) 
-            prefix += '.' + element 
- 
-    arcadia_rootmodules_cache = sorted(arcadia_rootmodules_cache) 
-    arcadia_modules_cache = {k: sorted(v) for k, v in arcadia_modules_cache.items()} 
- 
- 
-def arcadia_module_list(mod): 
-    if arcadia_modules_cache is None: 
-        arcadia_init_cache() 
- 
-    return arcadia_modules_cache.get(mod, ()) 
- 
- 
-def arcadia_get_root_modules(): 
-    if arcadia_rootmodules_cache is None: 
-        arcadia_init_cache() 
- 
-    return arcadia_rootmodules_cache 
- 
- 
- 
+arcadia_rootmodules_cache = None
+arcadia_modules_cache = None
+
+
+def arcadia_init_cache():
+    global arcadia_rootmodules_cache, arcadia_modules_cache
+    arcadia_rootmodules_cache = set()
+    arcadia_modules_cache = {}
+
+    all_modules = itertools.chain(
+        sys.builtin_module_names,
+        importer.memory
+    )
+
+    for name in all_modules:
+        path = name.split('.')
+        arcadia_rootmodules_cache.add(path[0])
+
+        prefix = path[0]
+        for element in path[1:]:
+            if element == '__init__':
+                continue
+
+            arcadia_modules_cache.setdefault(prefix, set()).add(element)
+            prefix += '.' + element
+
+    arcadia_rootmodules_cache = sorted(arcadia_rootmodules_cache)
+    arcadia_modules_cache = {k: sorted(v) for k, v in arcadia_modules_cache.items()}
+
+
+def arcadia_module_list(mod):
+    if arcadia_modules_cache is None:
+        arcadia_init_cache()
+
+    return arcadia_modules_cache.get(mod, ())
+
+
+def arcadia_get_root_modules():
+    if arcadia_rootmodules_cache is None:
+        arcadia_init_cache()
+
+    return arcadia_rootmodules_cache
+
+
+
 def module_list(path):
     """
     Return the list containing the names of the modules available in the given
@@ -196,7 +196,7 @@ def get_root_modules():
         rootmodules.extend(modules)
     if store:
         ip.db['rootmodules_cache'] = rootmodules_cache
-    rootmodules = list(set(rootmodules)) 
+    rootmodules = list(set(rootmodules))
     return rootmodules
 
 
@@ -216,8 +216,8 @@ def try_import(mod, only_modules=False):
     for module in mods[1:]:
         m = getattr(m, module)
 
-    filename = getattr(m, '__file__', '') 
-    m_is_init = '__init__' in (filename or '') or filename == mod 
+    filename = getattr(m, '__file__', '')
+    m_is_init = '__init__' in (filename or '') or filename == mod
 
     completions = []
     if (not hasattr(m, '__file__')) or (not only_modules) or m_is_init:
@@ -226,10 +226,10 @@ def try_import(mod, only_modules=False):
 
     completions.extend(getattr(m, '__all__', []))
     if m_is_init:
-        completions.extend(arcadia_module_list(mod)) 
+        completions.extend(arcadia_module_list(mod))
     completions = {c for c in completions if isinstance(c, string_types)}
     completions.discard('__init__')
-    return sorted(completions) 
+    return sorted(completions)
 
 
 #-----------------------------------------------------------------------------
@@ -278,10 +278,10 @@ def module_completion(line):
     # 'from xy<tab>' or 'import xy<tab>'
     if nwords < 3 and (words[0] in {'%aimport', 'import', 'from'}) :
         if nwords == 1:
-            return arcadia_get_root_modules() 
+            return arcadia_get_root_modules()
         mod = words[1].split('.')
         if len(mod) < 2:
-            return arcadia_get_root_modules() 
+            return arcadia_get_root_modules()
         completion_list = try_import('.'.join(mod[:-1]), True)
         return ['.'.join(mod[:-1] + [el]) for el in completion_list]
 
diff --git a/contrib/python/ipython/py2/IPython/core/oinspect.py b/contrib/python/ipython/py2/IPython/core/oinspect.py
index a64d4e7fc69..55a4efe8c03 100644
--- a/contrib/python/ipython/py2/IPython/core/oinspect.py
+++ b/contrib/python/ipython/py2/IPython/core/oinspect.py
@@ -45,15 +45,15 @@ from IPython.utils.signatures import signature
 from IPython.utils.colorable import Colorable
 
 from pygments import highlight
-try: 
-    # PythonLexer was renamed to Python2Lexer in pygments 2.5 
-    from pygments.lexers import Python2Lexer 
-except ImportError: 
-    from pygments.lexers import PythonLexer as Python2Lexer 
+try:
+    # PythonLexer was renamed to Python2Lexer in pygments 2.5
+    from pygments.lexers import Python2Lexer
+except ImportError:
+    from pygments.lexers import PythonLexer as Python2Lexer
 from pygments.formatters import HtmlFormatter
 
 def pylight(code):
-    return highlight(code, Python2Lexer(), HtmlFormatter(noclasses=True)) 
+    return highlight(code, Python2Lexer(), HtmlFormatter(noclasses=True))
 
 # builtin docstrings to ignore
 _func_call_docstring = types.FunctionType.__call__.__doc__
diff --git a/contrib/python/ipython/py2/IPython/core/release.py b/contrib/python/ipython/py2/IPython/core/release.py
index 03bed9bec37..94dea1073b1 100644
--- a/contrib/python/ipython/py2/IPython/core/release.py
+++ b/contrib/python/ipython/py2/IPython/core/release.py
@@ -20,7 +20,7 @@ name = 'ipython'
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 5
-_version_minor = 9 
+_version_minor = 9
 _version_patch = 0
 _version_extra = '.dev'
 # _version_extra = 'rc1'
diff --git a/contrib/python/ipython/py2/IPython/lib/lexers.py b/contrib/python/ipython/py2/IPython/lib/lexers.py
index b8544003acc..9160ae12457 100644
--- a/contrib/python/ipython/py2/IPython/lib/lexers.py
+++ b/contrib/python/ipython/py2/IPython/lib/lexers.py
@@ -34,12 +34,12 @@ This includes:
 import re
 
 # Third party
-from pygments.lexers import BashLexer, Python3Lexer 
-try: 
-    # PythonLexer was renamed to Python2Lexer in pygments 2.5 
-    from pygments.lexers import Python2Lexer 
-except ImportError: 
-    from pygments.lexers import PythonLexer as Python2Lexer 
+from pygments.lexers import BashLexer, Python3Lexer
+try:
+    # PythonLexer was renamed to Python2Lexer in pygments 2.5
+    from pygments.lexers import Python2Lexer
+except ImportError:
+    from pygments.lexers import PythonLexer as Python2Lexer
 from pygments.lexer import (
     Lexer, DelegatingLexer, RegexLexer, do_insertions, bygroups, using,
 )
@@ -92,7 +92,7 @@ def build_ipy_lexer(python3):
         aliases = ['ipython3']
         doc = """IPython3 Lexer"""
     else:
-        PyLexer = Python2Lexer 
+        PyLexer = Python2Lexer
         name = 'IPython'
         aliases = ['ipython2', 'ipython']
         doc = """IPython Lexer"""
diff --git a/contrib/python/ipython/py2/IPython/terminal/pt_inputhooks/qt.py b/contrib/python/ipython/py2/IPython/terminal/pt_inputhooks/qt.py
index 74c8c153cdb..7395ac39ebe 100644
--- a/contrib/python/ipython/py2/IPython/terminal/pt_inputhooks/qt.py
+++ b/contrib/python/ipython/py2/IPython/terminal/pt_inputhooks/qt.py
@@ -1,29 +1,29 @@
 import sys
-import os 
+import os
 from IPython.external.qt_for_kernel import QtCore, QtGui
 
 # If we create a QApplication, keep a reference to it so that it doesn't get
 # garbage collected.
 _appref = None
-_already_warned = False 
+_already_warned = False
 
 def inputhook(context):
     global _appref
     app = QtCore.QCoreApplication.instance()
     if not app:
-        if sys.platform == 'linux': 
-            if not os.environ.get('DISPLAY') \ 
-                    and not os.environ.get('WAYLAND_DISPLAY'): 
-                import warnings 
-                global _already_warned 
-                if not _already_warned: 
-                    _already_warned = True 
-                    warnings.warn( 
-                        'The DISPLAY or WAYLAND_DISPLAY enviroment variable is ' 
-                        'not set or empty and Qt5 requires this enviroment ' 
-                        'variable. Deactivate Qt5 code.' 
-                    ) 
-                return 
+        if sys.platform == 'linux':
+            if not os.environ.get('DISPLAY') \
+                    and not os.environ.get('WAYLAND_DISPLAY'):
+                import warnings
+                global _already_warned
+                if not _already_warned:
+                    _already_warned = True
+                    warnings.warn(
+                        'The DISPLAY or WAYLAND_DISPLAY enviroment variable is '
+                        'not set or empty and Qt5 requires this enviroment '
+                        'variable. Deactivate Qt5 code.'
+                    )
+                return
         _appref = app = QtGui.QApplication([" "])
     event_loop = QtCore.QEventLoop(app)
 
diff --git a/contrib/python/ipython/py2/IPython/testing/ipunittest.py b/contrib/python/ipython/py2/IPython/testing/ipunittest.py
index 4acc3477032..da059816e24 100644
--- a/contrib/python/ipython/py2/IPython/testing/ipunittest.py
+++ b/contrib/python/ipython/py2/IPython/testing/ipunittest.py
@@ -147,8 +147,8 @@ class Doc2UnitTester(object):
             def test(self):
                 # Make a new runner per function to be tested
                 runner = DocTestRunner(verbose=d2u.verbose)
-                for the_test in d2u.finder.find(func, func.__name__): 
-                    runner.run(the_test) 
+                for the_test in d2u.finder.find(func, func.__name__):
+                    runner.run(the_test)
                 failed = count_failures(runner)
                 if failed:
                     # Since we only looked at a single function's docstring,
diff --git a/contrib/python/ipython/py2/IPython/utils/_sysinfo.py b/contrib/python/ipython/py2/IPython/utils/_sysinfo.py
index 78ce81a4668..21dd2fccebb 100644
--- a/contrib/python/ipython/py2/IPython/utils/_sysinfo.py
+++ b/contrib/python/ipython/py2/IPython/utils/_sysinfo.py
@@ -1,2 +1,2 @@
 # GENERATED BY setup.py
-commit = u"2348ebbe4" 
+commit = u"2348ebbe4"
diff --git a/contrib/python/ipython/py2/bin/ya.make b/contrib/python/ipython/py2/bin/ya.make
index e7443af6fad..0ff960df6f0 100644
--- a/contrib/python/ipython/py2/bin/ya.make
+++ b/contrib/python/ipython/py2/bin/ya.make
@@ -3,7 +3,7 @@ PROGRAM(ipython)
 OWNER(g:python-contrib borman nslus)
 
 PEERDIR(
-    contrib/python/ipython 
+    contrib/python/ipython
 )
 
 PY_MAIN(IPython:start_ipython)
diff --git a/contrib/python/ipython/py2/ya.make b/contrib/python/ipython/py2/ya.make
index 54651531c09..c356efb08ca 100644
--- a/contrib/python/ipython/py2/ya.make
+++ b/contrib/python/ipython/py2/ya.make
@@ -1,273 +1,273 @@
 PY2_LIBRARY()
- 
+
 LICENSE(BSD-3-Clause)
- 
-VERSION(5.9.0) 
- 
-OWNER(g:python-contrib borman nslus) 
- 
-PEERDIR( 
-    contrib/python/backports.shutil-get-terminal-size 
-    contrib/python/decorator 
-    contrib/python/pickleshare 
-    contrib/python/simplegeneric 
-    contrib/python/traitlets 
-    contrib/python/path.py 
-    contrib/python/pathlib2 
-    contrib/python/prompt-toolkit 
-    contrib/python/Pygments 
-) 
- 
-IF (OS_WINDOWS) 
-    PEERDIR( 
-        contrib/python/colorama 
-        contrib/python/win_unicode_console 
-    ) 
-ELSE () 
-    PEERDIR( 
-        contrib/python/pexpect 
-    ) 
-ENDIF () 
- 
-IF (OS_DARWIN) 
-    PEERDIR( 
-        contrib/python/appnope 
-    ) 
-ENDIF () 
- 
+
+VERSION(5.9.0)
+
+OWNER(g:python-contrib borman nslus)
+
+PEERDIR(
+    contrib/python/backports.shutil-get-terminal-size
+    contrib/python/decorator
+    contrib/python/pickleshare
+    contrib/python/simplegeneric
+    contrib/python/traitlets
+    contrib/python/path.py
+    contrib/python/pathlib2
+    contrib/python/prompt-toolkit
+    contrib/python/Pygments
+)
+
+IF (OS_WINDOWS)
+    PEERDIR(
+        contrib/python/colorama
+        contrib/python/win_unicode_console
+    )
+ELSE ()
+    PEERDIR(
+        contrib/python/pexpect
+    )
+ENDIF ()
+
+IF (OS_DARWIN)
+    PEERDIR(
+        contrib/python/appnope
+    )
+ENDIF ()
+
 NO_CHECK_IMPORTS(IPython.*)
 
 NO_LINT()
 
-PY_SRCS( 
-    TOP_LEVEL 
-    IPython/__init__.py 
-    IPython/config.py 
-    IPython/consoleapp.py 
-    IPython/core/__init__.py 
-    IPython/core/alias.py 
-    IPython/core/application.py 
-    IPython/core/autocall.py 
-    IPython/core/builtin_trap.py 
-    IPython/core/compilerop.py 
-    IPython/core/completer.py 
-    IPython/core/completerlib.py 
-    IPython/core/crashhandler.py 
-    IPython/core/debugger.py 
-    IPython/core/display.py 
-    IPython/core/display_trap.py 
-    IPython/core/displayhook.py 
-    IPython/core/displaypub.py 
-    IPython/core/error.py 
-    IPython/core/events.py 
-    IPython/core/excolors.py 
-    IPython/core/extensions.py 
-    IPython/core/formatters.py 
-    IPython/core/getipython.py 
-    IPython/core/history.py 
-    IPython/core/historyapp.py 
-    IPython/core/hooks.py 
-    IPython/core/inputsplitter.py 
-    IPython/core/inputtransformer.py 
-    IPython/core/interactiveshell.py 
-    IPython/core/latex_symbols.py 
-    IPython/core/logger.py 
-    IPython/core/macro.py 
-    IPython/core/magic.py 
-    IPython/core/magic_arguments.py 
-    IPython/core/magics/__init__.py 
-    IPython/core/magics/auto.py 
-    IPython/core/magics/basic.py 
-    IPython/core/magics/code.py 
-    IPython/core/magics/config.py 
-    IPython/core/magics/display.py 
-    IPython/core/magics/execution.py 
-    IPython/core/magics/extension.py 
-    IPython/core/magics/history.py 
-    IPython/core/magics/logging.py 
-    IPython/core/magics/namespace.py 
-    IPython/core/magics/osm.py 
-    IPython/core/magics/pylab.py 
-    IPython/core/magics/script.py 
-    IPython/core/oinspect.py 
-    IPython/core/page.py 
-    IPython/core/payload.py 
-    IPython/core/payloadpage.py 
-    IPython/core/prefilter.py 
-    IPython/core/profileapp.py 
-    IPython/core/profiledir.py 
-    IPython/core/prompts.py 
-    IPython/core/pylabtools.py 
-    IPython/core/release.py 
-    IPython/core/shadowns.py 
-    IPython/core/shellapp.py 
-    IPython/core/splitinput.py 
-    IPython/core/ultratb.py 
-    IPython/core/usage.py 
-    IPython/display.py 
-    IPython/extensions/__init__.py 
-    IPython/extensions/autoreload.py 
-    IPython/extensions/cythonmagic.py 
-    IPython/extensions/rmagic.py 
-    IPython/extensions/storemagic.py 
-    IPython/extensions/sympyprinting.py 
-    IPython/external/__init__.py 
-    IPython/external/decorators/__init__.py 
-    IPython/external/decorators/_decorators.py 
-    IPython/external/decorators/_numpy_testing_noseclasses.py 
-    IPython/external/decorators/_numpy_testing_utils.py 
-    IPython/external/mathjax.py 
-    IPython/external/qt_for_kernel.py 
-    IPython/external/qt_loaders.py 
-    IPython/frontend.py 
-    IPython/html.py 
-    IPython/kernel/__init__.py 
-    IPython/kernel/adapter.py 
-    IPython/kernel/channels.py 
-    IPython/kernel/channelsabc.py 
-    IPython/kernel/client.py 
-    IPython/kernel/clientabc.py 
-    IPython/kernel/connect.py 
-    IPython/kernel/kernelspec.py 
-    IPython/kernel/kernelspecapp.py 
-    IPython/kernel/launcher.py 
-    IPython/kernel/manager.py 
-    IPython/kernel/managerabc.py 
-    IPython/kernel/multikernelmanager.py 
-    IPython/kernel/restarter.py 
-    IPython/kernel/threaded.py 
-    IPython/lib/__init__.py 
-    IPython/lib/backgroundjobs.py 
-    IPython/lib/clipboard.py 
-    IPython/lib/deepreload.py 
-    IPython/lib/demo.py 
-    IPython/lib/display.py 
-    IPython/lib/editorhooks.py 
-    IPython/lib/guisupport.py 
-    IPython/lib/inputhook.py 
-    IPython/lib/inputhookglut.py 
-    IPython/lib/inputhookgtk.py 
-    IPython/lib/inputhookgtk3.py 
-    IPython/lib/inputhookpyglet.py 
-    IPython/lib/inputhookqt4.py 
-    IPython/lib/inputhookwx.py 
-    IPython/lib/kernel.py 
-    IPython/lib/latextools.py 
-    IPython/lib/lexers.py 
-    IPython/lib/pretty.py 
-    IPython/lib/security.py 
-    IPython/nbconvert.py 
-    IPython/nbformat.py 
-    IPython/parallel.py 
-    IPython/paths.py 
-    IPython/qt.py 
-    IPython/sphinxext/__init__.py 
-    IPython/sphinxext/custom_doctests.py 
-    IPython/sphinxext/ipython_console_highlighting.py 
-    IPython/sphinxext/ipython_directive.py 
-    IPython/terminal/__init__.py 
-    IPython/terminal/console.py 
-    IPython/terminal/debugger.py 
-    IPython/terminal/embed.py 
-    IPython/terminal/interactiveshell.py 
-    IPython/terminal/ipapp.py 
-    IPython/terminal/magics.py 
-    IPython/terminal/prompts.py 
-    IPython/terminal/pt_inputhooks/__init__.py 
-    IPython/terminal/pt_inputhooks/glut.py 
-    IPython/terminal/pt_inputhooks/gtk3.py 
-    IPython/terminal/pt_inputhooks/gtk.py 
-    IPython/terminal/pt_inputhooks/osx.py 
-    IPython/terminal/pt_inputhooks/pyglet.py 
-    IPython/terminal/pt_inputhooks/qt.py 
-    IPython/terminal/pt_inputhooks/tk.py 
-    IPython/terminal/pt_inputhooks/wx.py 
-    IPython/terminal/ptshell.py 
-    IPython/terminal/ptutils.py 
-    IPython/terminal/shortcuts.py 
-    IPython/testing/__init__.py 
-    IPython/testing/decorators.py 
-    IPython/testing/globalipapp.py 
-    IPython/testing/iptest.py 
-    IPython/testing/iptestcontroller.py 
-    IPython/testing/ipunittest.py 
-    IPython/testing/plugin/__init__.py 
-    IPython/testing/plugin/dtexample.py 
-    IPython/testing/plugin/ipdoctest.py 
-    IPython/testing/plugin/iptest.py 
-    IPython/testing/plugin/setup.py 
-    IPython/testing/plugin/show_refs.py 
-    IPython/testing/plugin/simple.py 
-    IPython/testing/plugin/simplevars.py 
-    IPython/testing/plugin/test_ipdoctest.py 
-    IPython/testing/plugin/test_refs.py 
-    IPython/testing/skipdoctest.py 
-    IPython/utils/PyColorize.py 
-    IPython/utils/__init__.py 
-    IPython/utils/_get_terminal_size.py 
-    IPython/utils/_process_cli.py 
-    IPython/utils/_process_common.py 
-    IPython/utils/_process_posix.py 
-    IPython/utils/_process_win32.py 
-    IPython/utils/_process_win32_controller.py 
-    IPython/utils/_signatures.py 
-    IPython/utils/_sysinfo.py 
-    IPython/utils/_tokenize_py2.py 
-    IPython/utils/_tokenize_py3.py 
-    IPython/utils/capture.py 
-    IPython/utils/colorable.py 
-    IPython/utils/coloransi.py 
-    IPython/utils/contexts.py 
-    IPython/utils/daemonize.py 
-    IPython/utils/data.py 
-    IPython/utils/decorators.py 
-    IPython/utils/dir2.py 
-    IPython/utils/encoding.py 
-    IPython/utils/eventful.py 
-    IPython/utils/frame.py 
-    IPython/utils/generics.py 
-    IPython/utils/importstring.py 
-    IPython/utils/io.py 
-    IPython/utils/ipstruct.py 
-    IPython/utils/jsonutil.py 
-    IPython/utils/localinterfaces.py 
-    IPython/utils/log.py 
-    IPython/utils/module_paths.py 
-    IPython/utils/openpy.py 
-    IPython/utils/path.py 
-    IPython/utils/pickleutil.py 
-    IPython/utils/process.py 
-    IPython/utils/py3compat.py 
-    IPython/utils/rlineimpl.py 
-    IPython/utils/sentinel.py 
-    IPython/utils/shimmodule.py 
-    IPython/utils/signatures.py 
-    IPython/utils/strdispatch.py 
-    IPython/utils/sysinfo.py 
-    IPython/utils/syspathcontext.py 
-    IPython/utils/tempdir.py 
-    IPython/utils/terminal.py 
-    IPython/utils/text.py 
-    IPython/utils/timing.py 
-    IPython/utils/tokenize2.py 
-    IPython/utils/tokenutil.py 
-    IPython/utils/traitlets.py 
-    IPython/utils/tz.py 
-    IPython/utils/ulinecache.py 
-    IPython/utils/version.py 
-    IPython/utils/warn.py 
-    IPython/utils/wildcard.py 
-) 
- 
-RESOURCE_FILES( 
-    PREFIX contrib/python/ipython/py2/ 
-    .dist-info/METADATA 
-    .dist-info/top_level.txt 
-    IPython/core/profile/README_STARTUP 
-) 
- 
-END() 
- 
-RECURSE( 
-    bin 
-) 
+PY_SRCS(
+    TOP_LEVEL
+    IPython/__init__.py
+    IPython/config.py
+    IPython/consoleapp.py
+    IPython/core/__init__.py
+    IPython/core/alias.py
+    IPython/core/application.py
+    IPython/core/autocall.py
+    IPython/core/builtin_trap.py
+    IPython/core/compilerop.py
+    IPython/core/completer.py
+    IPython/core/completerlib.py
+    IPython/core/crashhandler.py
+    IPython/core/debugger.py
+    IPython/core/display.py
+    IPython/core/display_trap.py
+    IPython/core/displayhook.py
+    IPython/core/displaypub.py
+    IPython/core/error.py
+    IPython/core/events.py
+    IPython/core/excolors.py
+    IPython/core/extensions.py
+    IPython/core/formatters.py
+    IPython/core/getipython.py
+    IPython/core/history.py
+    IPython/core/historyapp.py
+    IPython/core/hooks.py
+    IPython/core/inputsplitter.py
+    IPython/core/inputtransformer.py
+    IPython/core/interactiveshell.py
+    IPython/core/latex_symbols.py
+    IPython/core/logger.py
+    IPython/core/macro.py
+    IPython/core/magic.py
+    IPython/core/magic_arguments.py
+    IPython/core/magics/__init__.py
+    IPython/core/magics/auto.py
+    IPython/core/magics/basic.py
+    IPython/core/magics/code.py
+    IPython/core/magics/config.py
+    IPython/core/magics/display.py
+    IPython/core/magics/execution.py
+    IPython/core/magics/extension.py
+    IPython/core/magics/history.py
+    IPython/core/magics/logging.py
+    IPython/core/magics/namespace.py
+    IPython/core/magics/osm.py
+    IPython/core/magics/pylab.py
+    IPython/core/magics/script.py
+    IPython/core/oinspect.py
+    IPython/core/page.py
+    IPython/core/payload.py
+    IPython/core/payloadpage.py
+    IPython/core/prefilter.py
+    IPython/core/profileapp.py
+    IPython/core/profiledir.py
+    IPython/core/prompts.py
+    IPython/core/pylabtools.py
+    IPython/core/release.py
+    IPython/core/shadowns.py
+    IPython/core/shellapp.py
+    IPython/core/splitinput.py
+    IPython/core/ultratb.py
+    IPython/core/usage.py
+    IPython/display.py
+    IPython/extensions/__init__.py
+    IPython/extensions/autoreload.py
+    IPython/extensions/cythonmagic.py
+    IPython/extensions/rmagic.py
+    IPython/extensions/storemagic.py
+    IPython/extensions/sympyprinting.py
+    IPython/external/__init__.py
+    IPython/external/decorators/__init__.py
+    IPython/external/decorators/_decorators.py
+    IPython/external/decorators/_numpy_testing_noseclasses.py
+    IPython/external/decorators/_numpy_testing_utils.py
+    IPython/external/mathjax.py
+    IPython/external/qt_for_kernel.py
+    IPython/external/qt_loaders.py
+    IPython/frontend.py
+    IPython/html.py
+    IPython/kernel/__init__.py
+    IPython/kernel/adapter.py
+    IPython/kernel/channels.py
+    IPython/kernel/channelsabc.py
+    IPython/kernel/client.py
+    IPython/kernel/clientabc.py
+    IPython/kernel/connect.py
+    IPython/kernel/kernelspec.py
+    IPython/kernel/kernelspecapp.py
+    IPython/kernel/launcher.py
+    IPython/kernel/manager.py
+    IPython/kernel/managerabc.py
+    IPython/kernel/multikernelmanager.py
+    IPython/kernel/restarter.py
+    IPython/kernel/threaded.py
+    IPython/lib/__init__.py
+    IPython/lib/backgroundjobs.py
+    IPython/lib/clipboard.py
+    IPython/lib/deepreload.py
+    IPython/lib/demo.py
+    IPython/lib/display.py
+    IPython/lib/editorhooks.py
+    IPython/lib/guisupport.py
+    IPython/lib/inputhook.py
+    IPython/lib/inputhookglut.py
+    IPython/lib/inputhookgtk.py
+    IPython/lib/inputhookgtk3.py
+    IPython/lib/inputhookpyglet.py
+    IPython/lib/inputhookqt4.py
+    IPython/lib/inputhookwx.py
+    IPython/lib/kernel.py
+    IPython/lib/latextools.py
+    IPython/lib/lexers.py
+    IPython/lib/pretty.py
+    IPython/lib/security.py
+    IPython/nbconvert.py
+    IPython/nbformat.py
+    IPython/parallel.py
+    IPython/paths.py
+    IPython/qt.py
+    IPython/sphinxext/__init__.py
+    IPython/sphinxext/custom_doctests.py
+    IPython/sphinxext/ipython_console_highlighting.py
+    IPython/sphinxext/ipython_directive.py
+    IPython/terminal/__init__.py
+    IPython/terminal/console.py
+    IPython/terminal/debugger.py
+    IPython/terminal/embed.py
+    IPython/terminal/interactiveshell.py
+    IPython/terminal/ipapp.py
+    IPython/terminal/magics.py
+    IPython/terminal/prompts.py
+    IPython/terminal/pt_inputhooks/__init__.py
+    IPython/terminal/pt_inputhooks/glut.py
+    IPython/terminal/pt_inputhooks/gtk3.py
+    IPython/terminal/pt_inputhooks/gtk.py
+    IPython/terminal/pt_inputhooks/osx.py
+    IPython/terminal/pt_inputhooks/pyglet.py
+    IPython/terminal/pt_inputhooks/qt.py
+    IPython/terminal/pt_inputhooks/tk.py
+    IPython/terminal/pt_inputhooks/wx.py
+    IPython/terminal/ptshell.py
+    IPython/terminal/ptutils.py
+    IPython/terminal/shortcuts.py
+    IPython/testing/__init__.py
+    IPython/testing/decorators.py
+    IPython/testing/globalipapp.py
+    IPython/testing/iptest.py
+    IPython/testing/iptestcontroller.py
+    IPython/testing/ipunittest.py
+    IPython/testing/plugin/__init__.py
+    IPython/testing/plugin/dtexample.py
+    IPython/testing/plugin/ipdoctest.py
+    IPython/testing/plugin/iptest.py
+    IPython/testing/plugin/setup.py
+    IPython/testing/plugin/show_refs.py
+    IPython/testing/plugin/simple.py
+    IPython/testing/plugin/simplevars.py
+    IPython/testing/plugin/test_ipdoctest.py
+    IPython/testing/plugin/test_refs.py
+    IPython/testing/skipdoctest.py
+    IPython/utils/PyColorize.py
+    IPython/utils/__init__.py
+    IPython/utils/_get_terminal_size.py
+    IPython/utils/_process_cli.py
+    IPython/utils/_process_common.py
+    IPython/utils/_process_posix.py
+    IPython/utils/_process_win32.py
+    IPython/utils/_process_win32_controller.py
+    IPython/utils/_signatures.py
+    IPython/utils/_sysinfo.py
+    IPython/utils/_tokenize_py2.py
+    IPython/utils/_tokenize_py3.py
+    IPython/utils/capture.py
+    IPython/utils/colorable.py
+    IPython/utils/coloransi.py
+    IPython/utils/contexts.py
+    IPython/utils/daemonize.py
+    IPython/utils/data.py
+    IPython/utils/decorators.py
+    IPython/utils/dir2.py
+    IPython/utils/encoding.py
+    IPython/utils/eventful.py
+    IPython/utils/frame.py
+    IPython/utils/generics.py
+    IPython/utils/importstring.py
+    IPython/utils/io.py
+    IPython/utils/ipstruct.py
+    IPython/utils/jsonutil.py
+    IPython/utils/localinterfaces.py
+    IPython/utils/log.py
+    IPython/utils/module_paths.py
+    IPython/utils/openpy.py
+    IPython/utils/path.py
+    IPython/utils/pickleutil.py
+    IPython/utils/process.py
+    IPython/utils/py3compat.py
+    IPython/utils/rlineimpl.py
+    IPython/utils/sentinel.py
+    IPython/utils/shimmodule.py
+    IPython/utils/signatures.py
+    IPython/utils/strdispatch.py
+    IPython/utils/sysinfo.py
+    IPython/utils/syspathcontext.py
+    IPython/utils/tempdir.py
+    IPython/utils/terminal.py
+    IPython/utils/text.py
+    IPython/utils/timing.py
+    IPython/utils/tokenize2.py
+    IPython/utils/tokenutil.py
+    IPython/utils/traitlets.py
+    IPython/utils/tz.py
+    IPython/utils/ulinecache.py
+    IPython/utils/version.py
+    IPython/utils/warn.py
+    IPython/utils/wildcard.py
+)
+
+RESOURCE_FILES(
+    PREFIX contrib/python/ipython/py2/
+    .dist-info/METADATA
+    .dist-info/top_level.txt
+    IPython/core/profile/README_STARTUP
+)
+
+END()
+
+RECURSE(
+    bin
+)