Merge heads.

This commit is contained in:
Eric Snow 2013-11-22 13:55:59 -07:00
commit 2f66ffa652
1 changed files with 2 additions and 0 deletions

View File

@ -200,6 +200,8 @@ class ExtendPathTests(unittest.TestCase):
dirname = self.create_init(pkgname) dirname = self.create_init(pkgname)
pathitem = os.path.join(dirname, pkgname) pathitem = os.path.join(dirname, pkgname)
fullname = '{}.{}'.format(pkgname, modname) fullname = '{}.{}'.format(pkgname, modname)
sys.modules.pop(fullname, None)
sys.modules.pop(pkgname, None)
try: try:
self.create_submodule(dirname, pkgname, modname, 0) self.create_submodule(dirname, pkgname, modname, 0)