[FIX] base: verifying python external dependencies was failing on OSX.
This commit is contained in:
parent
c776dce531
commit
fdb9aa29bf
|
@ -22,7 +22,7 @@ from docutils import nodes
|
||||||
from docutils.core import publish_string
|
from docutils.core import publish_string
|
||||||
from docutils.transforms import Transform, writer_aux
|
from docutils.transforms import Transform, writer_aux
|
||||||
from docutils.writers.html4css1 import Writer
|
from docutils.writers.html4css1 import Writer
|
||||||
import imp
|
import importlib
|
||||||
import logging
|
import logging
|
||||||
from operator import attrgetter
|
from operator import attrgetter
|
||||||
import os
|
import os
|
||||||
|
@ -353,15 +353,10 @@ class module(osv.osv):
|
||||||
if not depends:
|
if not depends:
|
||||||
return
|
return
|
||||||
for pydep in depends.get('python', []):
|
for pydep in depends.get('python', []):
|
||||||
parts = pydep.split('.')
|
try:
|
||||||
parts.reverse()
|
importlib.import_module(pydep)
|
||||||
path = None
|
except ImportError:
|
||||||
while parts:
|
raise ImportError('No module named %s' % (pydep,))
|
||||||
part = parts.pop()
|
|
||||||
try:
|
|
||||||
_, path, _ = imp.find_module(part, path and [path] or None)
|
|
||||||
except ImportError:
|
|
||||||
raise ImportError('No module named %s' % (pydep,))
|
|
||||||
|
|
||||||
for binary in depends.get('bin', []):
|
for binary in depends.get('bin', []):
|
||||||
if tools.find_in_path(binary) is None:
|
if tools.find_in_path(binary) is None:
|
||||||
|
|
Loading…
Reference in New Issue