diff --git a/mitogen/core.py b/mitogen/core.py index a897af2f..6bed7132 100644 --- a/mitogen/core.py +++ b/mitogen/core.py @@ -683,12 +683,6 @@ class Importer(object): _tls.running = True try: _v and LOG.debug('%r.find_module(%r)', self, fullname) - # #114: explicitly whitelisted prefixes override any - # system-installed package. - if self.whitelist != ['']: - if any(fullname.startswith(s) for s in self.whitelist): - return self - pkgname, dot, _ = fullname.rpartition('.') pkg = sys.modules.get(pkgname) if pkgname and getattr(pkg, '__loader__', None) is not self: @@ -701,6 +695,12 @@ class Importer(object): _v and LOG.debug('%r: master doesn\'t know %r', self, fullname) return None + # #114: explicitly whitelisted prefixes override any + # system-installed package. + if self.whitelist != ['']: + if any(fullname.startswith(s) for s in self.whitelist): + return self + try: self.builtin_find_module(fullname) _vv and IOLOG.debug('%r: %r is available locally',