Skip to content

Commit

Permalink
Merge from 5.x: PR #22024
Browse files Browse the repository at this point in the history
  • Loading branch information
ccordoba12 committed Apr 26, 2024
2 parents 852ef91 + c3e512e commit 362fa24
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
26 changes: 13 additions & 13 deletions spyder/plugins/explorer/widgets/explorer.py
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ def handle_reset():
@Slot()
def open(self, fnames=None):
"""Open files with the appropriate application"""
if fnames is None:
if fnames is None or isinstance(fnames, bool):
fnames = self.get_selected_filenames()
for fname in fnames:
if osp.isfile(fname) and encoding.is_text_file(fname):
Expand All @@ -1118,7 +1118,7 @@ def open_association(self, app_path):
@Slot()
def open_external(self, fnames=None):
"""Open files with default application"""
if fnames is None:
if fnames is None or isinstance(fnames, bool):
fnames = self.get_selected_filenames()
for fname in fnames:
self.open_outside_spyder([fname])
Expand Down Expand Up @@ -1188,7 +1188,7 @@ def delete_file(self, fname, multiple, yes_to_all):
@Slot()
def delete(self, fnames=None):
"""Delete files"""
if fnames is None:
if fnames is None or isinstance(fnames, bool):
fnames = self.get_selected_filenames()
multiple = len(fnames) > 1
yes_to_all = None
Expand Down Expand Up @@ -1242,14 +1242,14 @@ def rename_file(self, fname):
@Slot()
def show_in_external_file_explorer(self, fnames=None):
"""Show file in external file explorer"""
if fnames is None:
if fnames is None or isinstance(fnames, bool):
fnames = self.get_selected_filenames()
show_in_external_file_explorer(fnames)

@Slot()
def rename(self, fnames=None):
"""Rename files"""
if fnames is None:
if fnames is None or isinstance(fnames, bool):
fnames = self.get_selected_filenames()
if not isinstance(fnames, (tuple, list)):
fnames = [fnames]
Expand Down Expand Up @@ -1333,7 +1333,7 @@ def get_selected_dir(self):
def new_folder(self, basedir=None):
"""New folder."""

if basedir is None:
if basedir is None or isinstance(basedir, bool):
basedir = self.get_selected_dir()

title = _('New folder')
Expand Down Expand Up @@ -1365,7 +1365,7 @@ def create_new_file(self, current_path, title, filters, create_func):
def new_file(self, basedir=None):
"""New file"""

if basedir is None:
if basedir is None or isinstance(basedir, bool):
basedir = self.get_selected_dir()

title = _("New file")
Expand All @@ -1385,7 +1385,7 @@ def create_func(fname):
@Slot()
def run(self, fnames=None):
"""Run Python scripts"""
if fnames is None:
if fnames is None or isinstance(fnames, bool):
fnames = self.get_selected_filenames()
for fname in fnames:
self.sig_run_requested.emit(fname)
Expand Down Expand Up @@ -1439,7 +1439,7 @@ def copy_relative_path(self):
@Slot()
def copy_file_clipboard(self, fnames=None):
"""Copy file(s)/folders(s) to clipboard."""
if fnames is None:
if fnames is None or isinstance(fnames, bool):
fnames = self.get_selected_filenames()
if not isinstance(fnames, (tuple, list)):
fnames = [fnames]
Expand All @@ -1457,7 +1457,7 @@ def copy_file_clipboard(self, fnames=None):
@Slot()
def save_file_clipboard(self, fnames=None):
"""Paste file from clipboard into file/project explorer directory."""
if fnames is None:
if fnames is None or isinstance(fnames, bool):
fnames = self.get_selected_filenames()
if not isinstance(fnames, (tuple, list)):
fnames = [fnames]
Expand Down Expand Up @@ -1544,7 +1544,7 @@ def save_file_clipboard(self, fnames=None):
@Slot()
def open_interpreter(self, fnames=None):
"""Open interpreter"""
if fnames is None:
if fnames is None or isinstance(fnames, bool):
fnames = self.get_selected_filenames()
for path in sorted(fnames):
self.sig_open_interpreter_requested.emit(path)
Expand Down Expand Up @@ -1781,7 +1781,7 @@ def convert_notebooks(self):
def new_package(self, basedir=None):
"""New package"""

if basedir is None:
if basedir is None or isinstance(basedir, None):
basedir = self.get_selected_dir()

title = _('New package')
Expand All @@ -1792,7 +1792,7 @@ def new_package(self, basedir=None):
def new_module(self, basedir=None):
"""New module"""

if basedir is None:
if basedir is None or isinstance(basedir, bool):
basedir = self.get_selected_dir()

title = _("New module")
Expand Down
2 changes: 2 additions & 0 deletions spyder/widgets/collectionseditor.py
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,8 @@ def duplicate_item(self):
@Slot()
def rename_item(self, new_name=None):
"""Rename item"""
if isinstance(new_name, bool):
new_name = None
self.copy_item(erase_original=True, new_name=new_name)

@Slot()
Expand Down

0 comments on commit 362fa24

Please sign in to comment.