Skip to content

Commit

Permalink
Merge pull request #2660 from pylint-dev/post-3.3.7
Browse files Browse the repository at this point in the history
Merge maintenance following 3.3.7 rekease
  • Loading branch information
Pierre-Sassoulas authored Dec 21, 2024
2 parents 631a76c + 9bb082e commit b5bb771
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 10 deletions.
21 changes: 16 additions & 5 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ Maintainers
-----------
- Pierre Sassoulas <[email protected]>
- Daniël van Noord <[email protected]>
- Hippo91 <[email protected]>
- Marc Mueller <[email protected]>
- Jacob Walls <[email protected]>
- Marc Mueller <[email protected]>
- Hippo91 <[email protected]>
- Bryce Guinta <[email protected]>
- Ceridwen <[email protected]>
- Mark Byrne <[email protected]>
Expand All @@ -32,27 +32,33 @@ Contributors
------------
- Emile Anclin <[email protected]>
- Nick Drozd <[email protected]>
- correctmost <[email protected]>
- Andrew Haigh <[email protected]>
- Julien Cristau <[email protected]>
- David Liu <[email protected]>
- Alexandre Fayolle <[email protected]>
- Eevee (Alex Munroe) <[email protected]>
- temyurchenko <[email protected]>
- David Gilman <[email protected]>
- Tushar Sadhwani <[email protected]>
- Julien Jehannet <[email protected]>
- Calen Pennington <[email protected]>
- Antonio <[email protected]>
- Hugo van Kemenade <[email protected]>
- Artem Yurchenko <[email protected]>
- Tim Martin <[email protected]>
- Phil Schaf <[email protected]>
- Alex Hall <[email protected]>
- Raphael Gaschignard <[email protected]>
- Radosław Ganczarek <[email protected]>
- Paligot Gérard <[email protected]>
- Ioana Tagirta <[email protected]>
- Eric Vergnaud <[email protected]>
- Derek Gustafson <[email protected]>
- David Shea <[email protected]>
- Daniel Harding <[email protected]>
- Christian Clauss <[email protected]>
- Akhil Kamat <[email protected]>
- Ville Skyttä <[email protected]>
- Rene Zhang <[email protected]>
- Philip Lorenz <[email protected]>
Expand All @@ -65,12 +71,12 @@ Contributors
- FELD Boris <[email protected]>
- Enji Cooper <[email protected]>
- Dani Alcala <[email protected]>
- Antonio <[email protected]>
- Adrien Di Mascio <[email protected]>
- tristanlatr <[email protected]>
- [email protected] <[email protected]>
- doranid <[email protected]>
- brendanator <[email protected]>
- akamat10 <[email protected]>
- Tomas Gavenciak <[email protected]>
- Tim Paine <[email protected]>
- Thomas Hisch <[email protected]>
Expand Down Expand Up @@ -129,29 +135,36 @@ Contributors
- Peter de Blanc <[email protected]>
- Peter Talley <[email protected]>
- Ovidiu Sabou <[email protected]>
- Oleh Prypin <[email protected]>
- Nicolas Noirbent <[email protected]>
- Neil Girdhar <[email protected]>
- Miro Hrončok <[email protected]>
- Michał Masłowski <[email protected]>
- Mateusz Bysiek <[email protected]>
- Matej Aleksandrov <[email protected]>
- Marcelo Trylesinski <[email protected]>
- Leandro T. C. Melo <[email protected]>
- Konrad Weihmann <[email protected]>
- Kian Meng, Ang <[email protected]>
- Kai Mueller <[email protected]>
- Jörg Thalheim <[email protected]>
- Jérome Perrin <[email protected]>
- JulianJvn <[email protected]>
- Josef Kemetmüller <[email protected]>
- Jonathan Striebel <[email protected]>
- John Belmonte <[email protected]>
- Jeff Widman <[email protected]>
- Jeff Quast <[email protected]>
- Jarrad Hope <[email protected]>
- Jared Garst <[email protected]>
- Jamie Scott <[email protected]>
- Jakub Wilk <[email protected]>
- Iva Miholic <[email protected]>
- Ionel Maries Cristian <[email protected]>
- HoverHell <[email protected]>
- Hashem Nasarat <[email protected]>
- HQupgradeHQ <[email protected]>
- Gwyn Ciesla <[email protected]>
- Grygorii Iermolenko <[email protected]>
- Gregory P. Smith <[email protected]>
- Giuseppe Scrivano <[email protected]>
Expand Down Expand Up @@ -191,8 +204,6 @@ Contributors
- Alexander Scheel <[email protected]>
- Alexander Presnyakov <[email protected]>
- Ahmed Azzaoui <[email protected]>
- JulianJvn <[email protected]>
- Gwyn Ciesla <[email protected]>

Co-Author
---------
Expand Down
9 changes: 8 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,17 @@ Release date: TBA
Closes #2513


What's New in astroid 3.3.7?
What's New in astroid 3.3.8?
============================
Release date: TBA




What's New in astroid 3.3.7?
============================
Release date: 2024-12-20

* Fix inability to import `collections.abc` in python 3.13.1. The reported fix in astroid 3.3.6
did not actually fix this issue.

Expand Down
10 changes: 6 additions & 4 deletions astroid/interpreter/_import/spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -386,13 +386,15 @@ def _search_zip(
if PY310_PLUS:
if not importer.find_spec(os.path.sep.join(modpath)):
raise ImportError(
"No module named %s in %s/%s"
% (".".join(modpath[1:]), filepath, modpath)
"No module named {} in {}/{}".format(
".".join(modpath[1:]), filepath, modpath
)
)
elif not importer.find_module(os.path.sep.join(modpath)):
raise ImportError(
"No module named %s in %s/%s"
% (".".join(modpath[1:]), filepath, modpath)
"No module named {} in {}/{}".format(
".".join(modpath[1:]), filepath, modpath
)
)
return (
ModuleType.PY_ZIPMODULE,
Expand Down

0 comments on commit b5bb771

Please sign in to comment.