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

Use strict optional checking in glibc #12091

Merged
merged 7 commits into from
Jul 5, 2023
Merged

Use strict optional checking in glibc #12091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
54be97e
Use strict optional checking in glibc
hauntsaninja Aug 15, 2022
b5a40ed
news
hauntsaninja Jun 20, 2023
4211775
remove the error code to silence ruff
hauntsaninja Jun 20, 2023
36014e6
don't catch attributeerror
hauntsaninja Jun 20, 2023
e995f25
nope
hauntsaninja Jun 20, 2023
b5377ae
nope
hauntsaninja Jun 20, 2023
997f92a
Merge branch 'main' into strict-optional-glibc
hauntsaninja Jul 5, 2023
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
Empty file added news/5C12428B-09FA-49BC-A886-6F5D8885BC14.trivial.rst
View file
Open in desktop
Empty file.
8 changes: 4 additions & 4 deletions src/pip/_internal/utils/glibc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# The following comment should be removed at some point in the future.
# mypy: strict-optional=False

import os
import sys
from typing import Optional, Tuple
Expand All @@ -20,8 +17,11 @@ def glibc_version_string_confstr() -> Optional[str]:
if sys.platform == "win32":
return None
try:
gnu_libc_version = os.confstr("CS_GNU_LIBC_VERSION")
if gnu_libc_version is None:
return None
# os.confstr("CS_GNU_LIBC_VERSION") returns a string like "glibc 2.17":
_, version = os.confstr("CS_GNU_LIBC_VERSION").split()
_, version = gnu_libc_version.split()
except (AttributeError, OSError, ValueError):
# os.confstr() or CS_GNU_LIBC_VERSION not available (or a bad value)...
return None
Expand Down