pydevd-pycharm 241.14494.241__tar.gz → 241.15989.111__tar.gz

{pydevd-pycharm-241.14494.241/pydevd_pycharm.egg-info → pydevd-pycharm-241.15989.111}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pydevd-pycharm
-Version: 241.14494.241
+Version: 241.15989.111
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd-pycharm-241.15989.111/VERSION

@@ -0,0 +1 @@
+241.15989.111

{pydevd-pycharm-241.14494.241 → pydevd-pycharm-241.15989.111}/_pydev_bundle/pydev_ipython_code_executor.py

@@ -38,8 +38,6 @@ class IPythonCodeExecutor(BaseCodeExecutor):
         self.show_banner = show_banner
 
     def get_greeting_msg(self):
-        if self.show_banner:
-            self.interpreter.show_banner()
         return self.interpreter.get_greeting_msg()
 
     def do_add_exec(self, code_fragment):

{pydevd-pycharm-241.14494.241 → pydevd-pycharm-241.15989.111}/_pydev_bundle/pydev_ipython_console.py

@@ -24,8 +24,6 @@ class IPythonInterpreterInterface(BaseInterpreterInterface):
         self.show_banner = show_banner
 
     def get_greeting_msg(self):
-        if self.show_banner:
-            self.interpreter.show_banner()
         return self.interpreter.get_greeting_msg()
 
     def do_add_exec(self, code_fragment):

{pydevd-pycharm-241.14494.241 → pydevd-pycharm-241.15989.111}/_pydev_bundle/pydev_ipython_console_011.py

@@ -19,6 +19,7 @@ import os
 import sys
 import codeop
 import traceback
+from copy import deepcopy
 
 from IPython.core.error import UsageError
 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
@@ -27,7 +28,7 @@ from IPython.core.formatters import DisplayFormatter
 from IPython.core import release
 
 from IPython.terminal.interactiveshell import TerminalInteractiveShell
-from IPython.terminal.ipapp import load_default_config
+from IPython.terminal.ipapp import TerminalIPythonApp
 from IPython import InteractiveShell
 
 from traitlets import Type
@@ -245,6 +246,24 @@ class PyDebuggerTerminalInteractiveShell(PyDevTerminalInteractiveShell):
 InteractiveShellABC.register(PyDevTerminalInteractiveShell)  # @UndefinedVariable
 InteractiveShellABC.register(PyDebuggerTerminalInteractiveShell)
 
+class PyDevIpythonApp(TerminalIPythonApp):
+    def initialize(self, shell_cls):
+        """Do actions after construct, but before starting the app."""
+        cl_config = deepcopy(self.config)
+        self.init_profile_dir()
+        self.init_config_files()
+        self.load_config_file()
+        self.update_config(cl_config)
+        self.init_path()
+        self.init_shell(shell_cls)
+        self.init_extensions()
+        self.init_code()
+
+    def init_shell(self, shell_cls):
+        self.shell = shell_cls.instance()
+        self.shell.configurables.append(self)
+
+
 #=======================================================================================================================
 # _PyDevIPythonFrontEnd
 #=======================================================================================================================
@@ -256,27 +275,35 @@ class _PyDevIPythonFrontEnd:
         # Create and initialize our IPython instance.
         self.is_jupyter_debugger = is_jupyter_debugger
         if is_jupyter_debugger:
-            if hasattr(PyDebuggerTerminalInteractiveShell, 'new_instance') and PyDebuggerTerminalInteractiveShell.new_instance is not None:
+            if self._has_shell_instance(PyDebuggerTerminalInteractiveShell, 'new_instance'):
                 self.ipython = PyDebuggerTerminalInteractiveShell.new_instance
             else:
                 # if we already have some InteractiveConsole instance (Python Console: Attach Debugger)
-                if hasattr(PyDevTerminalInteractiveShell, '_instance') and PyDevTerminalInteractiveShell._instance is not None:
+                if self._has_shell_instance(PyDevTerminalInteractiveShell, '_instance'):
                     PyDevTerminalInteractiveShell.clear_instance()
 
                 InteractiveShell.clear_instance()
-                self.ipython = PyDebuggerTerminalInteractiveShell.instance(config=load_default_config())
+
+                self.ipython = self._init_ipy_app(PyDebuggerTerminalInteractiveShell).shell
                 PyDebuggerTerminalInteractiveShell.new_instance = PyDebuggerTerminalInteractiveShell._instance
         else:
-            if hasattr(PyDevTerminalInteractiveShell, '_instance') and PyDevTerminalInteractiveShell._instance is not None:
+            if self._has_shell_instance(PyDevTerminalInteractiveShell, '_instance'):
                 self.ipython = PyDevTerminalInteractiveShell._instance
             else:
-                self.ipython = PyDevTerminalInteractiveShell.instance(config=load_default_config())
+                self.ipython = self._init_ipy_app(PyDevTerminalInteractiveShell).shell
 
         self._curr_exec_line = 0
         self._curr_exec_lines = []
 
-    def show_banner(self):
-        self.ipython.show_banner()
+    def _init_ipy_app(self, shell_cls):
+        application = PyDevIpythonApp()
+        application.initialize(shell_cls)
+        return application
+
+
+    def _has_shell_instance(self, shell_cls, instance_str):
+        return getattr(shell_cls, instance_str, None) is not None
+
 
     def update(self, globals, locals):
         ns = self.ipython.user_ns

{pydevd-pycharm-241.14494.241 → pydevd-pycharm-241.15989.111}/_pydevd_bundle/pydevd_comm.py

@@ -148,7 +148,7 @@ from _pydevd_bundle.pydevd_comm_constants import (
 MAX_IO_MSG_SIZE = 1000  #if the io is too big, we'll not send all (could make the debugger too non-responsive)
 #this number can be changed if there's need to do so
 
-VERSION_STRING = "241.14494.241"
+VERSION_STRING = "241.15989.111"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
 file_system_encoding = getfilesystemencoding()

{pydevd-pycharm-241.14494.241 → pydevd-pycharm-241.15989.111/pydevd_pycharm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pydevd-pycharm
-Version: 241.14494.241
+Version: 241.15989.111
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd-pycharm-241.14494.241/VERSION

@@ -1 +0,0 @@
-241.14494.241