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
4b42ff60
Commit
4b42ff60
authored
Feb 24, 2012
by
Philip Jenvey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
unused imports, pep8
parent
6f73874e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
Lib/importlib/_bootstrap.py
Lib/importlib/_bootstrap.py
+8
-6
Lib/importlib/abc.py
Lib/importlib/abc.py
+4
-6
No files found.
Lib/importlib/_bootstrap.py
View file @
4b42ff60
...
...
@@ -69,7 +69,7 @@ def _r_long(int_bytes):
def
_path_join
(
*
args
):
"""Replacement for os.path.join."""
return
path_sep
.
join
(
x
[:
-
len
(
path_sep
)]
if
x
.
endswith
(
path_sep
)
else
x
for
x
in
args
if
x
)
for
x
in
args
if
x
)
def
_path_exists
(
path
):
...
...
@@ -406,14 +406,16 @@ class _LoaderBasics:
pass
else
:
if
_r_long
(
raw_timestamp
)
!=
source_mtime
:
raise
ImportError
(
"bytecode is stale for {}"
.
format
(
fullname
))
raise
ImportError
(
"bytecode is stale for {}"
.
format
(
fullname
))
try
:
source_size
=
source_stats
[
'size'
]
&
0xFFFFFFFF
except
KeyError
:
pass
else
:
if
_r_long
(
raw_size
)
!=
source_size
:
raise
ImportError
(
"bytecode is stale for {}"
.
format
(
fullname
))
raise
ImportError
(
"bytecode is stale for {}"
.
format
(
fullname
))
# Can't return the code object as errors from marshal loading need to
# propagate even when source is available.
return
data
[
12
:]
...
...
@@ -519,7 +521,7 @@ class SourceLoader(_LoaderBasics):
code_object
=
compile
(
source_bytes
,
source_path
,
'exec'
,
dont_inherit
=
True
)
if
(
not
sys
.
dont_write_bytecode
and
bytecode_path
is
not
None
and
source_mtime
is
not
None
):
source_mtime
is
not
None
):
# If e.g. Jython ever implements imp.cache_from_source to have
# their own cached file format, this block of code will most likely
# throw an exception.
...
...
@@ -890,7 +892,7 @@ class _ImportLockContext:
def
_resolve_name
(
name
,
package
,
level
):
"""Resolve a relative module name to an absolute one."""
bits
=
package
.
rsplit
(
'.'
,
level
-
1
)
bits
=
package
.
rsplit
(
'.'
,
level
-
1
)
if
len
(
bits
)
<
level
:
raise
ValueError
(
'attempted relative import beyond top-level package'
)
base
=
bits
[
0
]
...
...
@@ -1010,7 +1012,7 @@ def _handle_fromlist(module, fromlist, import_):
fromlist
=
list
(
fromlist
)
fromlist
.
remove
(
'*'
)
fromlist
.
extend
(
module
.
__all__
)
for
x
in
(
y
for
y
in
fromlist
if
not
hasattr
(
module
,
y
)):
for
x
in
(
y
for
y
in
fromlist
if
not
hasattr
(
module
,
y
)):
try
:
import_
(
'{0}.{1}'
.
format
(
module
.
__name__
,
x
))
except
ImportError
:
...
...
Lib/importlib/abc.py
View file @
4b42ff60
"""Abstract base classes related to import."""
from
.
import
_bootstrap
from
.
import
machinery
from
.
import
util
import
abc
import
imp
import
io
import
marshal
import
os.path
import
sys
import
tokenize
import
types
import
warnings
...
...
@@ -256,7 +252,8 @@ class PyPycLoader(PyLoader):
try
:
magic
=
data
[:
4
]
if
len
(
magic
)
<
4
:
raise
ImportError
(
"bad magic number in {}"
.
format
(
fullname
))
raise
ImportError
(
"bad magic number in {}"
.
format
(
fullname
))
raw_timestamp
=
data
[
4
:
8
]
if
len
(
raw_timestamp
)
<
4
:
raise
EOFError
(
"bad timestamp in {}"
.
format
(
fullname
))
...
...
@@ -264,7 +261,8 @@ class PyPycLoader(PyLoader):
bytecode
=
data
[
8
:]
# Verify that the magic number is valid.
if
imp
.
get_magic
()
!=
magic
:
raise
ImportError
(
"bad magic number in {}"
.
format
(
fullname
))
raise
ImportError
(
"bad magic number in {}"
.
format
(
fullname
))
# Verify that the bytecode is not stale (only matters when
# there is source to fall back on.
if
source_timestamp
:
...
...
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