SHA256
1
0
forked from pool/python38

Accepting request 889802 from home:bnavigator:branches:devel:languages:python:Factory

- Make sure to close the import_failed.map file after the exception
  has been raised in order to avoid ResourceWarnings when the
  failing import is part of a try...except block.

Please sync to the other flavors.

This fixes test suite failures of packages with `-W error` and optional imports.
(e.g. pytest-doctestplus)

OBS-URL: https://build.opensuse.org/request/show/889802
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python38?expand=0&rev=65
This commit is contained in:
Matej Cepl 2021-05-02 17:07:37 +00:00 committed by Git OBS Bridge
parent c4ad231e8c
commit 0bcf65704a
2 changed files with 13 additions and 5 deletions

View File

@ -8,11 +8,12 @@ if __spec__:
else: else:
failed_name = __name__ failed_name = __name__
for line in open(failed_map_path): with open(failed_map_path) as fd:
package = line.split(':')[0] for line in fd:
imports = line.split(':')[1] package = line.split(':')[0]
if failed_name in imports: imports = line.split(':')[1]
raise ImportError(f"""Module '{failed_name}' is not installed. if failed_name in imports:
raise ImportError(f"""Module '{failed_name}' is not installed.
Use: Use:
sudo zypper install {package} sudo zypper install {package}
to install it.""") to install it.""")

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun May 2 09:20:06 UTC 2021 - Ben Greiner <code@bnavigator.de>
- Make sure to close the import_failed.map file after the exception
has been raised in order to avoid ResourceWarnings when the
failing import is part of a try...except block.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 28 17:32:55 UTC 2021 - Matej Cepl <mcepl@suse.com> Wed Apr 28 17:32:55 UTC 2021 - Matej Cepl <mcepl@suse.com>