Skip to content

Fix function call on a member string #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghastmask wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix function call on a member string #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
311ca60
Fix function call on a member string
ghastmask Oct 18, 2015
020977f
Hack for recognizing higan/icarus directories
ghastmask Nov 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ice/console.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def is_valid_rom(self, path):
If no extensions are defined for this console, we just accept any file
"""

if self.extensions == "":
if self.extensions == "" and os.path.isfile(path):
return True
extension = os.path.splitext(path)[1].lower()
return any(extension == ('.' + x.strip().lower())
Expand Down
5 changes: 1 addition & 4 deletions src/ice/filesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ def _paths_in_directory(self, directory, incl_subdirs=False):

def files_in_directory(self, directory, include_subdirectories=False):
assert self.is_directory(directory), "Must specify a directory"
return filter(
os.path.isfile,
self._paths_in_directory(directory, incl_subdirs=include_subdirectories),
)
return self._paths_in_directory(directory, incl_subdirs=include_subdirectories)

def subdirectories_of_directory(self, directory, recursive=False):
assert self.is_directory(directory), "Must specify a directory"
Expand Down
2 changes: 1 addition & 1 deletion src/ice/rom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def __eq__(self, other):
def prefixed_name(self):
prefix = self.console.prefix
if prefix:
return "%s %s" % (prefix, self.name())
return "%s %s" % (prefix, self.name)
else:
return self.name

Expand Down