Rooba
/
mitogen
mirror of https://github.com/mitogen-hq/mitogen.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master: fix resolve_relpath() 

looks like this was just as broken on 2.x, and suddenly we're
finding a bunch more legit Django deps. It seems anywhere
absolute_import appeared in 2.x, we skipped some imports.
This commit is contained in:
David Wilson 2018-06-26 04:11:35 +01:00
parent b0404bef40
commit c141dd10ec
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mitogen/master.py
View File

@ -436,7 +436,7 @@ class ModuleFinder(object):
# This would be an ImportError in real code. # This would be an ImportError in real code.
return '' return ''
return '.'.join(bits[:-level]) return '.'.join(bits[:-level]) + '.'
def generate_parent_names(self, fullname): def generate_parent_names(self, fullname):
while '.' in fullname: while '.' in fullname:
@ -471,7 +471,7 @@ class ModuleFinder(object):
modnames = [modname, '%s.%s' % (fullname, modname)] modnames = [modname, '%s.%s' % (fullname, modname)]
else: else:
modnames = [ modnames = [
'%s.%s' % (self.resolve_relpath(fullname, level), modname) '%s%s' % (self.resolve_relpath(fullname, level), modname)
] ]
maybe_names.extend(modnames) maybe_names.extend(modnames)

31
tests/module_finder_test.py
View File

@ -120,7 +120,7 @@ class ResolveRelPathTest(testlib.TestCase):
self.assertEquals('', self.call('email.utils', 0)) self.assertEquals('', self.call('email.utils', 0))
def test_rel1(self): def test_rel1(self):
self.assertEquals('email', self.call('email.utils', 1)) self.assertEquals('email.', self.call('email.utils', 1))
def test_rel2(self): def test_rel2(self):
self.assertEquals('', self.call('email.utils', 2)) self.assertEquals('', self.call('email.utils', 2))
@ -188,14 +188,15 @@ class FindRelatedTest(testlib.TestCase):
SIMPLE_EXPECT = set([ SIMPLE_EXPECT = set([
'mitogen', 'mitogen',
'mitogen.compat',
'mitogen.compat.functools',
'mitogen.core', 'mitogen.core',
'mitogen.master', 'mitogen.master',
'mitogen.minify', 'mitogen.minify',
'mitogen.parent', 'mitogen.parent',
]) ])
if sys.version_info < (3, 2):
SIMPLE_EXPECT.add('mitogen.compat')
SIMPLE_EXPECT.add('mitogen.compat.functools')
if sys.version_info < (2, 7): if sys.version_info < (2, 7):
SIMPLE_EXPECT.add('mitogen.compat.tokenize') SIMPLE_EXPECT.add('mitogen.compat.tokenize')
@ -289,25 +290,45 @@ class DjangoFindRelatedTest(testlib.TestCase):
'django.db.models.related', 'django.db.models.related',
'django.db.models.signals', 'django.db.models.signals',
'django.db.models.sql', 'django.db.models.sql',
'django.db.models.sql.aggregates',
'django.db.models.sql.constants',
'django.db.models.sql.datastructures',
'django.db.models.sql.expressions',
'django.db.models.sql.query',
'django.db.models.sql.subqueries',
'django.db.models.sql.where',
'django.db.transaction', 'django.db.transaction',
'django.db.utils', 'django.db.utils',
'django.dispatch', 'django.dispatch',
'django.dispatch.dispatcher', 'django.dispatch.dispatcher',
'django.dispatch.saferef', 'django.dispatch.saferef',
'django.forms', 'django.forms',
'django.forms.fields',
'django.forms.forms',
'django.forms.formsets',
'django.forms.models',
'django.forms.util',
'django.forms.widgets',
'django.utils', 'django.utils',
'django.utils._os', 'django.utils._os',
'django.utils.crypto', 'django.utils.crypto',
'django.utils.datastructures', 'django.utils.datastructures',
'django.utils.dateformat',
'django.utils.dateparse', 'django.utils.dateparse',
'django.utils.dates',
'django.utils.datetime_safe',
'django.utils.decorators', 'django.utils.decorators',
'django.utils.deprecation', 'django.utils.deprecation',
'django.utils.encoding', 'django.utils.encoding',
'django.utils.formats',
'django.utils.functional', 'django.utils.functional',
'django.utils.html',
'django.utils.html_parser',
'django.utils.importlib', 'django.utils.importlib',
'django.utils.ipv6', 'django.utils.ipv6',
'django.utils.itercompat', 'django.utils.itercompat',
'django.utils.module_loading', 'django.utils.module_loading',
'django.utils.numberformat',
'django.utils.safestring', 'django.utils.safestring',
'django.utils.six', 'django.utils.six',
'django.utils.text', 'django.utils.text',
@ -316,6 +337,10 @@ class DjangoFindRelatedTest(testlib.TestCase):
'django.utils.tree', 'django.utils.tree',
'django.utils.tzinfo', 'django.utils.tzinfo',
'pkg_resources', 'pkg_resources',
'pkg_resources.extern',
'pkg_resources.extern.appdirs',
'pkg_resources.extern.packaging',
'pkg_resources.extern.six',
'pytz', 'pytz',
'pytz.exceptions', 'pytz.exceptions',
'pytz.tzfile', 'pytz.tzfile',