File tree 2 files changed +6
-12
lines changed 2 files changed +6
-12
lines changed Original file line number Diff line number Diff line change @@ -31,8 +31,10 @@ def files(self):
31
31
32
32
class ZipReader (abc .TraversableResources ):
33
33
def __init__ (self , loader , module ):
34
- _ , _ , name = module .rpartition ('.' )
35
- self .prefix = loader .prefix .replace ('\\ ' , '/' ) + name + '/'
34
+ self .prefix = loader .prefix .replace ('\\ ' , '/' )
35
+ if loader .is_package (module ):
36
+ _ , _ , name = module .rpartition ('.' )
37
+ self .prefix += name + '/'
36
38
self .archive = loader .archive
37
39
38
40
def open_resource (self , resource ):
Original file line number Diff line number Diff line change @@ -254,17 +254,9 @@ def load_module(self, fullname):
254
254
255
255
256
256
def get_resource_reader (self , fullname ):
257
- """Return the ResourceReader for a package in a zip file.
258
-
259
- If 'fullname' is a package within the zip file, return the
260
- 'ResourceReader' object for the package. Otherwise return None.
261
- """
262
- try :
263
- if not self .is_package (fullname ):
264
- return None
265
- except ZipImportError :
266
- return None
257
+ """Return the ResourceReader for a module in a zip file."""
267
258
from importlib .readers import ZipReader
259
+
268
260
return ZipReader (self , fullname )
269
261
270
262
You can’t perform that action at this time.
0 commit comments