Merge from 3.x: PR #4864

Fixes #4769
spyder-ide · Aug 5, 2017 · 0724278 · 0724278
2 parents d1149c8 + 555566c
commit 0724278
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/spyder/plugins/explorer.py b/spyder/plugins/explorer.py
@@ -76,20 +76,19 @@ def register_plugin(self):
         treewidget.sig_renamed.connect(self.main.editor.renamed)
         treewidget.sig_create_module.connect(self.main.editor.new)
         treewidget.sig_new_file.connect(lambda t: self.main.editor.new(text=t))
-        treewidget.sig_open_interpreter.connect(ipyconsole.create_client_from_path)
-        treewidget.redirect_stdio.connect(self.main.redirect_internalshell_stdio)
+        treewidget.sig_open_interpreter.connect(
+            ipyconsole.create_client_from_path)
+        treewidget.redirect_stdio.connect(
+            self.main.redirect_internalshell_stdio)
         treewidget.sig_run.connect(
-                     lambda fname:
-                     self.main.open_external_console(
-                         to_text_string(fname),
-                         osp.dirname(to_text_string(fname)),
-                         '', False, False, True, '', False)
-                     )
+            lambda fname:
+            ipyconsole.run_script(fname, osp.dirname(fname), '', False, False,
+                                  False, True))
         treewidget.sig_open_dir.connect(
-                     lambda dirname:
-                     self.main.workingdirectory.chdir(dirname,
-                                                      refresh_explorer=False,
-                                                      refresh_console=True))
+            lambda dirname:
+            self.main.workingdirectory.chdir(dirname,
+                                             refresh_explorer=False,
+                                             refresh_console=True))
 
         self.main.editor.open_dir.connect(self.chdir)
 

diff --git a/spyder/plugins/ipythonconsole.py b/spyder/plugins/ipythonconsole.py
@@ -805,7 +805,6 @@ def register_plugin(self):
 
         self.tabwidget.currentChanged.connect(self.update_working_directory)
 
-
     #------ Public API (for clients) ------------------------------------------
     def get_clients(self):
         """Return clients list"""

diff --git a/spyder/plugins/projects.py b/spyder/plugins/projects.py
@@ -125,14 +125,16 @@ def register_plugin(self):
         treewidget.sig_removed_tree.connect(self.editor.removed_tree)
         treewidget.sig_renamed.connect(self.editor.renamed)
         treewidget.sig_create_module.connect(self.editor.new)
-        treewidget.sig_new_file.connect(lambda t: self.main.editor.new(text=t))
-        treewidget.sig_open_interpreter.connect(ipyconsole.create_client_from_path)
-        treewidget.redirect_stdio.connect(self.main.redirect_internalshell_stdio)
+        treewidget.sig_new_file.connect(
+            lambda t: self.main.editor.new(text=t))
+        treewidget.sig_open_interpreter.connect(
+            ipyconsole.create_client_from_path)
+        treewidget.redirect_stdio.connect(
+            self.main.redirect_internalshell_stdio)
         treewidget.sig_run.connect(
-                     lambda fname:
-                     self.main.open_external_console(to_text_string(fname),
-                                         osp.dirname(to_text_string(fname)),
-                                         '', False, False, True, '', False))
+            lambda fname:
+            ipyconsole.run_script(fname, osp.dirname(fname), '', False, False,
+                                  False, True))
 
         # New project connections. Order matters!
         self.sig_project_loaded.connect(

diff --git a/spyder/utils/programs.py b/spyder/utils/programs.py
@@ -258,7 +258,6 @@ def run_python_script_in_terminal(fname, wdir, args, interact,
 
     :str wdir: working directory, may be empty.
     """
-
     # If fname has spaces on it it can't be ran on Windows, so we have to
     # enclose it in quotes. Also wdir can come with / as os.sep, so we
     # need to take care of it