Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix deprecated importlib methods #869

Merged
merged 10 commits into from
Dec 30, 2020
Merged

Fix deprecated importlib methods #869

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4f8ac13
Changes the return value of the _precache_zipimporters function so th…
hippo91 Dec 24, 2020
75910f4
Adds docstring to the _precache_zipimporters function
hippo91 Dec 24, 2020
614a8a8
Adds copyright notice
hippo91 Dec 24, 2020
c9b9a00
Adds an entry
hippo91 Dec 24, 2020
f1613f4
Reformated according to black
hippo91 Dec 24, 2020
be47792
Merge branch 'master' into fix_deprecated_importlib_methods
hippo91 Dec 29, 2020
bdf1bea
Update astroid/interpreter/_import/spec.py
hippo91 Dec 29, 2020
714abbc
Update astroid/interpreter/_import/spec.py
hippo91 Dec 29, 2020
f91f52e
Update astroid/interpreter/_import/spec.py
hippo91 Dec 29, 2020
b6e03f2
Update astroid/interpreter/_import/spec.py
hippo91 Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ astroid's ChangeLog
What's New in astroid 2.5.0?
============================
Release Date: TBA
* Fix deprecated importlib methods

Closes #703

* Add `python 3.9` support.

* The flat attribute of ``numpy.ndarray`` is now inferred as an ``numpy.ndarray`` itself.
Expand Down
13 changes: 12 additions & 1 deletion astroid/interpreter/_import/spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# Copyright (c) 2018 Nick Drozd <nicholasdrozd@gmail.com>
# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
# Copyright (c) 2020 Gergely Kalmar <GergelyKalmar@users.noreply.github.com>

import abc
import collections
Expand Down Expand Up @@ -270,6 +271,16 @@ def _cached_set_diff(left, right):


def _precache_zipimporters(path=None):
"""
For each path that has not been already cached
in the sys.path_importer_cache, create a new zipimporter
instance and store it into the cache.
hippo91 marked this conversation as resolved.
Show resolved Hide resolved
Return a dict associating all paths, stored into the cache, to corresponding
hippo91 marked this conversation as resolved.
Show resolved Hide resolved
zipimporter instances
hippo91 marked this conversation as resolved.
Show resolved Hide resolved

:param path: paths that has to be added into the cache
:return: association between paths stored into the cache and zipimporter instances
hippo91 marked this conversation as resolved.
Show resolved Hide resolved
"""
pic = sys.path_importer_cache

# When measured, despite having the same complexity (O(n)),
Expand All @@ -285,7 +296,7 @@ def _precache_zipimporters(path=None):
pic[entry_path] = zipimport.zipimporter(entry_path)
except zipimport.ZipImportError:
continue
return pic
return {key: value for key, value in pic.items() if isinstance(value, zipimport.zipimporter)}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if that's as intended, but this simply filters out everything from pic that is not a zipimport.zipimporter class (i.e. the other types of importers). This may be related to the failing test too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GergelyKalmar it is exactly as intended. The goal is to have a container with only one type of objects. The failing tests (dealing with pypy) are not due to this PR.



def _search_zip(modpath, pic):
Expand Down