Working toward making dirsep and extsep cross-platform

This commit is contained in:
Elf M. Sternberg 2016-07-08 20:43:58 -07:00
parent be7c4e4d21
commit 9fac406305
1 changed files with 6 additions and 3 deletions

View File

@ -6,6 +6,10 @@ import imp
import types import types
import pkgutil import pkgutil
SEP = os.sep
EXS = os.extsep
FLS = [('%s' + SEP + '__init__' + EXS + '%s', True),
('%s' + EXS + '%s', False)]
class PolyLoader(): class PolyLoader():
_loader_handlers = [] _loader_handlers = []
@ -85,10 +89,9 @@ class PolyFinder(object):
return None return None
path = os.path.realpath(self.path) path = os.path.realpath(self.path)
fls = [("%s/__init__.%s", True), ("%s.%s", False)] for (fp, ispkg) in FLS:
for (fp, ispkg) in fls:
for (compiler, suffix) in PolyLoader._loader_handlers: for (compiler, suffix) in PolyLoader._loader_handlers:
composed_path = fp % ("%s/%s" % (path, subname), suffix) composed_path = fp % (('%s' + SEP + '%s') % (path, subname), suffix)
if os.path.isdir(composed_path): if os.path.isdir(composed_path):
raise IOError("Invalid: Directory name ends in recognized suffix") raise IOError("Invalid: Directory name ends in recognized suffix")
if os.path.isfile(composed_path): if os.path.isfile(composed_path):