Fix Django console to work with the refactored Python console from #PR444

diff --git a/python/educational-python/src/META-INF/PyCharmEduPlugin.xml b/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
index 79f3dd061d98f17e3a68dfa49b7dca310125a3e0..1ab0655a25eaa2db2c2d9736d3f34f771ab36398 100644 (file)
--- a/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
+++ b/python/educational-python/src/META-INF/PyCharmEduPlugin.xml
@@ -23,12 +23,6 @@
     </component>
   </application-components>
 
-  <extensions defaultExtensionNs="com.intellij">
-    <internal_executor id="PyConsoleToolWindowExecutor" implementation="com.jetbrains.python.console.PyConsoleToolWindowExecutor"/>
-    <postStartupActivity implementation="com.jetbrains.python.console.PyConsoleStarter"/>
-
-  </extensions>
-
   <extensions defaultExtensionNs="com.intellij">
       <programRunner implementation="com.jetbrains.python.edu.debugger.PyEduDebugRunner"/>
       <executor implementation="com.jetbrains.python.edu.debugger.PyEduDebugExecutor" order="first,after run"/>

diff --git a/python/ide/src/META-INF/PyCharmCorePlugin.xml b/python/ide/src/META-INF/PyCharmCorePlugin.xml
index 47ad96b0654579658acf44f6e8802ce67e7bbda2..e8a88bce634e5f8311bf17accc88a8de18f296b9 100644 (file)
--- a/python/ide/src/META-INF/PyCharmCorePlugin.xml
+++ b/python/ide/src/META-INF/PyCharmCorePlugin.xml
@@ -13,8 +13,4 @@
     </component>
 
   </application-components>
-  <extensions defaultExtensionNs="com.intellij">
-    <internal_executor id="PyConsoleToolWindowExecutor" implementation="com.jetbrains.python.console.PyConsoleToolWindowExecutor"/>
-    <postStartupActivity implementation="com.jetbrains.python.console.PyConsoleStarter"/>
-  </extensions>
 </idea-plugin>

diff --git a/python/ide/src/META-INF/pycharm-core.xml b/python/ide/src/META-INF/pycharm-core.xml
index 042067272baf4252a1a995ef7c60ed2894e138e5..3cb80f00d5d29ea9e27a8639f0645cedb3d78ea8 100644 (file)
--- a/python/ide/src/META-INF/pycharm-core.xml
+++ b/python/ide/src/META-INF/pycharm-core.xml
@@ -76,6 +76,9 @@
     <renameHandler implementation="com.intellij.platform.renameProject.ProjectFolderRenameHandler"/>
 
     <!-- Console -->
+    <internal_executor id="PyConsoleToolWindowExecutor" implementation="com.jetbrains.python.console.PyConsoleToolWindowExecutor"/>
+    <postStartupActivity implementation="com.jetbrains.python.console.PyConsoleStarter"/>
+
 
     <directoryIndexExcludePolicy implementation="com.jetbrains.python.PyDirectoryIndexExcludePolicy"/>
 

diff --git a/python/src/com/jetbrains/python/console/PydevConsoleRunnerFactory.java b/python/src/com/jetbrains/python/console/PydevConsoleRunnerFactory.java
index ffecb6ddb39c434ba6630222429710b8711eae5b..9046a494f0a0a3fba01aafda6147ed2b1efb40c2 100644 (file)
--- a/python/src/com/jetbrains/python/console/PydevConsoleRunnerFactory.java
+++ b/python/src/com/jetbrains/python/console/PydevConsoleRunnerFactory.java
@@ -42,6 +42,7 @@ import java.util.Map;
  */
 public class PydevConsoleRunnerFactory extends PythonConsoleRunnerFactory {
   @Override
+  @NotNull
   public PydevConsoleRunnerImpl createConsoleRunner(@NotNull Project project,
                                                     @Nullable Module contextModule) {
     Pair<Sdk, Module> sdkAndModule = PydevConsoleRunner.findPythonSdkAndModule(project, contextModule);
@@ -125,6 +126,7 @@ public class PydevConsoleRunnerFactory extends PythonConsoleRunnerFactory {
     envs.put(PythonEnvUtil.IPYTHONENABLE, ipythonEnabled);
   }
 
+  @NotNull
   protected PydevConsoleRunnerImpl createConsoleRunner(Project project,
                                                        Sdk sdk,
                                                        String workingDir,

diff --git a/python/src/com/jetbrains/python/console/PythonConsoleRunnerFactory.java b/python/src/com/jetbrains/python/console/PythonConsoleRunnerFactory.java
index 57b51c924ff884f93de28e7b6ba63eb5a46f2270..c8e2a0cab09215333ee5534ddd9053b052f039f6 100644 (file)
--- a/python/src/com/jetbrains/python/console/PythonConsoleRunnerFactory.java
+++ b/python/src/com/jetbrains/python/console/PythonConsoleRunnerFactory.java
@@ -29,6 +29,8 @@ public abstract class PythonConsoleRunnerFactory {
   public static PythonConsoleRunnerFactory getInstance() {
     return ServiceManager.getService(PythonConsoleRunnerFactory.class);
   }
+
+  @NotNull
   public abstract PydevConsoleRunner createConsoleRunner(@NotNull final Project project,
                                                          @Nullable Module contextModule);
 }