Skip to content

Commit

Permalink
Fixes PyOtherSideQtRCImporter for submodule imports (#134)
Browse files Browse the repository at this point in the history
* fixes PyOtherSideQtRCImporter for submodule imports
* adjusts QrRCImporter to use the original check
  • Loading branch information
timegrid authored May 31, 2024
1 parent 4fa3406 commit 302c111
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/qrc_importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def get_filename(fullname):

for candidate in ("{}/{}.py", "{}/{}/__init__.py"):
filename = candidate.format(import_path, basename)
if pyotherside.qrc_is_file(filename[len("qrc:") :]):
if pyotherside.qrc_is_file(filename[len("qrc:"):]):
return filename


Expand All @@ -40,15 +40,15 @@ def __init__(self, filepath):
self.filepath = filepath

def get_data(self, path):
return pyotherside.qrc_get_file_contents(self.filepath[len("qrc:") :])
return pyotherside.qrc_get_file_contents(self.filepath[len("qrc:"):])

def get_filename(self, fullname):
return get_filename(fullname)


class PyOtherSideQtRCImporter(abc.MetaPathFinder):
def find_spec(self, fullname, path, target=None):
if path is None:
if path is None or all(x.startswith('qrc:') for x in path):
fname = get_filename(fullname)
if fname:
return spec_from_loader(fullname, PyOtherSideQtRCLoader(fname))
Expand Down

0 comments on commit 302c111

Please sign in to comment.