Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
d200bf53
Commit
d200bf53
authored
May 13, 2012
by
Brett Cannon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add importlib.util.resolve_name().
parent
61009468
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
73 additions
and
1 deletion
+73
-1
Doc/library/importlib.rst
Doc/library/importlib.rst
+16
-0
Lib/importlib/test/test_util.py
Lib/importlib/test/test_util.py
+39
-1
Lib/importlib/util.py
Lib/importlib/util.py
+16
-0
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Doc/library/importlib.rst
View file @
d200bf53
...
...
@@ -737,6 +737,22 @@ find and load modules.
This module contains the various objects that help in the construction of
an :term:`importer`.
.. function:: resolve_name(name, package)
Resolve a relative module name to an absolute one.
If **name** has no leading dots, then **name** is simply returned. This
allows for usage such as
``importlib.util.resolve_name('
sys
', __package__)`` without doing a
check to see if the **package** argument is needed.
:exc:`ValueError` is raised if **name** is a relative module name but
package is a false value (e.g. ``None`` or the empty string).
:exc:`ValueError` is also raised a relative name would escape its containing
package (e.g. requesting ``..bacon`` from within the ``spam`` package).
.. versionadded:: 3.3
.. decorator:: module_for_loader
A :term:`decorator` for a :term:`loader` method,
...
...
Lib/importlib/test/test_util.py
View file @
d200bf53
...
...
@@ -161,9 +161,47 @@ class SetPackageTests(unittest.TestCase):
self
.
assertEqual
(
wrapped
.
__name__
,
fxn
.
__name__
)
self
.
assertEqual
(
wrapped
.
__qualname__
,
fxn
.
__qualname__
)
class
ResolveNameTests
(
unittest
.
TestCase
):
"""Tests importlib.util.resolve_name()."""
def
test_absolute
(
self
):
# bacon
self
.
assertEqual
(
'bacon'
,
util
.
resolve_name
(
'bacon'
,
None
))
def
test_aboslute_within_package
(
self
):
# bacon in spam
self
.
assertEqual
(
'bacon'
,
util
.
resolve_name
(
'bacon'
,
'spam'
))
def
test_no_package
(
self
):
# .bacon in ''
with
self
.
assertRaises
(
ValueError
):
util
.
resolve_name
(
'.bacon'
,
''
)
def
test_in_package
(
self
):
# .bacon in spam
self
.
assertEqual
(
'spam.eggs.bacon'
,
util
.
resolve_name
(
'.bacon'
,
'spam.eggs'
))
def
test_other_package
(
self
):
# ..bacon in spam.bacon
self
.
assertEqual
(
'spam.bacon'
,
util
.
resolve_name
(
'..bacon'
,
'spam.eggs'
))
def
test_escape
(
self
):
# ..bacon in spam
with
self
.
assertRaises
(
ValueError
):
util
.
resolve_name
(
'..bacon'
,
'spam'
)
def
test_main
():
from
test
import
support
support
.
run_unittest
(
ModuleForLoaderTests
,
SetPackageTests
)
support
.
run_unittest
(
ModuleForLoaderTests
,
SetPackageTests
,
ResolveNameTests
)
if
__name__
==
'__main__'
:
...
...
Lib/importlib/util.py
View file @
d200bf53
...
...
@@ -3,3 +3,19 @@
from
._bootstrap
import
module_for_loader
from
._bootstrap
import
set_loader
from
._bootstrap
import
set_package
from
._bootstrap
import
_resolve_name
def
resolve_name
(
name
,
package
):
"""Resolve a relative module name to an absolute one."""
if
not
name
.
startswith
(
'.'
):
return
name
elif
not
package
:
raise
ValueError
(
'{!r} is not a relative name '
'(no leading dot)'
.
format
(
name
))
level
=
0
for
character
in
name
:
if
character
!=
'.'
:
break
level
+=
1
return
_resolve_name
(
name
[
level
:],
package
,
level
)
Misc/NEWS
View file @
d200bf53
...
...
@@ -23,6 +23,8 @@ Core and Builtins
Library
-------
- Add importlib.util.resolve_name().
- Issue #14366: Support lzma compression in zip files.
Patch by Serhiy Storchaka.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment