commit:     df50509742221211e74386536aab9bd8aade9c56
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 11 19:50:37 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 12 21:16:09 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=df505097

util.urlopen: Drop Python 2 compat code

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Part-of: https://github.com/gentoo/portage/pull/1459
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/portage/util/_urlopen.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/portage/util/_urlopen.py b/lib/portage/util/_urlopen.py
index 1f27bbe76f..72801b43ba 100644
--- a/lib/portage/util/_urlopen.py
+++ b/lib/portage/util/_urlopen.py
@@ -61,11 +61,7 @@ def urlopen(url, timeout=10, if_modified_since=None, 
headers={}, proxies=None):
 
     hdl = opener.open(request, timeout=timeout)
     if hdl.headers.get("last-modified", ""):
-        try:
-            add_header = hdl.headers.add_header
-        except AttributeError:
-            # Python 2
-            add_header = hdl.headers.addheader
+        add_header = hdl.headers.add_header
         add_header("timestamp", 
http_to_timestamp(hdl.headers.get("last-modified")))
     return hdl
 

Reply via email to