mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

merge with 3.3

Browse source
This commit is contained in:
Brett Cannon 2012-12-22 19:38:32 -05:00
commit 2909d6b47c
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/modulefinder.py
View file

@ -2,6 +2,7 @@
import dis
import imp
import importlib.machinery
import marshal
import os
import sys

15
Lib/test/test_modulefinder.py
View file

@ -196,6 +196,18 @@ a/module.py
from . import bar
"""]
relative_import_test_4 = [
"a.module",
["a", "a.module"],
[],
[],
"""\
a/__init__.py
def foo(): pass
a/module.py
from . import *
"""]
def open_file(path):
dirname = os.path.dirname(path)
@ -273,6 +285,9 @@ class ModuleFinderTest(unittest.TestCase):
def test_relative_imports_3(self):
self._do_test(relative_import_test_3)
def test_relative_imports_4(self):
self._do_test(relative_import_test_4)
def test_main():
support.run_unittest(ModuleFinderTest)