diff options
author | robot-contrib <robot-contrib@yandex-team.ru> | 2022-05-18 00:43:36 +0300 |
---|---|---|
committer | robot-contrib <robot-contrib@yandex-team.ru> | 2022-05-18 00:43:36 +0300 |
commit | 9e5f436a8b2a27bcc7802e443ea3ef3e41a82a75 (patch) | |
tree | 78b522cab9f76336e62064d4d8ff7c897659b20e /contrib/python/ipython/py3/patches | |
parent | 8113a823ffca6451bb5ff8f0334560885a939a24 (diff) | |
download | ydb-9e5f436a8b2a27bcc7802e443ea3ef3e41a82a75.tar.gz |
Update contrib/python/ipython/py3 to 8.3.0
ref:e84342d4d30476f9148137f37fd0c6405fd36f55
Diffstat (limited to 'contrib/python/ipython/py3/patches')
4 files changed, 40 insertions, 17 deletions
diff --git a/contrib/python/ipython/py3/patches/01-arcadia.patch b/contrib/python/ipython/py3/patches/01-arcadia.patch index 335f93f18ed..eafd4f30f6c 100644 --- a/contrib/python/ipython/py3/patches/01-arcadia.patch +++ b/contrib/python/ipython/py3/patches/01-arcadia.patch @@ -1,6 +1,6 @@ --- contrib/python/ipython/py3/IPython/core/completer.py (index) +++ contrib/python/ipython/py3/IPython/core/completer.py (working tree) -@@ -996,6 +996,7 @@ def _make_signature(completion)-> str: +@@ -1025,6 +1025,7 @@ def _make_signature(completion)-> str: """ @@ -8,7 +8,7 @@ # it looks like this might work on jedi 0.17 if hasattr(completion, 'get_signatures'): signatures = completion.get_signatures() -@@ -1388,7 +1389,7 @@ class IPCompleter(Completer): +@@ -1438,7 +1439,7 @@ class IPCompleter(Completer): else: raise ValueError("Don't understand self.omit__names == {}".format(self.omit__names)) @@ -17,7 +17,7 @@ try_jedi = True try: -@@ -1415,7 +1416,7 @@ class IPCompleter(Completer): +@@ -1465,7 +1466,7 @@ class IPCompleter(Completer): if not try_jedi: return [] try: @@ -96,7 +96,7 @@ def module_list(path): """ Return the list containing the names of the modules available in the given -@@ -165,7 +212,8 @@ def try_import(mod: str, only_modules=False) -> List[str]: +@@ -176,7 +223,8 @@ def try_import(mod: str, only_modules=False) -> List[str]: except: return [] @@ -106,9 +106,9 @@ completions = [] if (not hasattr(m, '__file__')) or (not only_modules) or m_is_init: -@@ -174,10 +222,10 @@ def try_import(mod: str, only_modules=False) -> List[str]: - - completions.extend(getattr(m, '__all__', [])) +@@ -190,10 +238,10 @@ def try_import(mod: str, only_modules=False) -> List[str]: + completions.extend(m_all) + if m_is_init: - completions.extend(module_list(os.path.dirname(m.__file__))) + completions.extend(arcadia_module_list(mod)) @@ -119,7 +119,7 @@ #----------------------------------------------------------------------------- -@@ -226,10 +274,10 @@ def module_completion(line): +@@ -242,10 +290,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: @@ -134,7 +134,7 @@ --- contrib/python/ipython/py3/IPython/core/extensions.py (index) +++ contrib/python/ipython/py3/IPython/core/extensions.py (working tree) -@@ -72,11 +72,11 @@ class ExtensionManager(Configurable): +@@ -84,11 +84,11 @@ class ExtensionManager(Configurable): if module_str in self.loaded: return "already loaded" @@ -151,7 +151,7 @@ print(("Loading extensions from {dir} is deprecated. " --- contrib/python/ipython/py3/IPython/core/profiledir.py (index) +++ contrib/python/ipython/py3/IPython/core/profiledir.py (working tree) -@@ -111,13 +111,11 @@ class ProfileDir(LoggingConfigurable): +@@ -112,13 +112,11 @@ class ProfileDir(LoggingConfigurable): self._mkdir(self.startup_dir) readme = os.path.join(self.startup_dir, 'README') diff --git a/contrib/python/ipython/py3/patches/02-fix-ya.make.patch b/contrib/python/ipython/py3/patches/02-fix-ya.make.patch index 75e0e9b0bba..7ae6f38152e 100644 --- a/contrib/python/ipython/py3/patches/02-fix-ya.make.patch +++ b/contrib/python/ipython/py3/patches/02-fix-ya.make.patch @@ -1,17 +1,17 @@ --- contrib/python/ipython/py3/.dist-info/METADATA (index) +++ contrib/python/ipython/py3/.dist-info/METADATA (working tree) -@@ -24,7 +24,7 @@ Classifier: Programming Language :: Python :: 3 :: Only - Classifier: Topic :: System :: Shells - Requires-Python: >=3.7 - Requires-Dist: setuptools (>=18.5) +@@ -28,7 +28,7 @@ Classifier: Programming Language :: Python :: 3 :: Only + License-File: LICENSE + Requires-Dist: backcall + Requires-Dist: decorator -Requires-Dist: jedi (>=0.16) +Requires-Dist: jedi (>=0.13) - Requires-Dist: decorator + Requires-Dist: matplotlib-inline Requires-Dist: pickleshare - Requires-Dist: traitlets (>=4.2) + Requires-Dist: prompt-toolkit (!=3.0.0,!=3.0.1,<3.1.0,>=2.0.0) --- contrib/python/ipython/py3/ya.make (index) +++ contrib/python/ipython/py3/ya.make (working tree) -@@ -14,13 +14,28 @@ PEERDIR( +@@ -14,14 +14,29 @@ PEERDIR( contrib/python/decorator contrib/python/jedi contrib/python/matplotlib-inline @@ -19,6 +19,7 @@ contrib/python/pickleshare contrib/python/prompt-toolkit contrib/python/setuptools + contrib/python/stack-data contrib/python/traitlets ) diff --git a/contrib/python/ipython/py3/patches/03-dissable-backgroud-highlighting.patch b/contrib/python/ipython/py3/patches/03-dissable-backgroud-highlighting.patch new file mode 100644 index 00000000000..bb9b4924d02 --- /dev/null +++ b/contrib/python/ipython/py3/patches/03-dissable-backgroud-highlighting.patch @@ -0,0 +1,11 @@ +--- contrib/python/ipython/py3/IPython/core/ultratb.py (index) ++++ contrib/python/ipython/py3/IPython/core/ultratb.py (working tree) +@@ -842,7 +842,7 @@ class VerboseTB(TBTools): + before = context - after + if self.has_colors: + style = get_style_by_name("default") +- style = stack_data.style_with_executing_node(style, "bg:ansiyellow") ++ style = stack_data.style_with_executing_node(style, "") + formatter = Terminal256Formatter(style=style) + else: + formatter = None diff --git a/contrib/python/ipython/py3/patches/04-fix.patch b/contrib/python/ipython/py3/patches/04-fix.patch new file mode 100644 index 00000000000..913caffe76e --- /dev/null +++ b/contrib/python/ipython/py3/patches/04-fix.patch @@ -0,0 +1,11 @@ +--- contrib/python/ipython/py3/IPython/core/ultratb.py (index) ++++ contrib/python/ipython/py3/IPython/core/ultratb.py (working tree) +@@ -239,7 +239,7 @@ class TBTools(colorable.Colorable): + self.debugger_cls = debugger_cls or debugger.Pdb + + if call_pdb: +- self.pdb = debugger_cls() ++ self.pdb = self.debugger_cls() + else: + self.pdb = None + |