Merge "Fix compatibility with urllib3 v2.6"

Author: Zuul

swiftclient/client.py

@@ -441,7 +441,7 @@ def putrequest(self, full_path, data=None, headers=None, files=None):
     def getresponse(self):
         """Adapt requests response to httplib interface"""
         self.resp.status = self.resp.status_code
-        old_getheader = self.resp.raw.getheader
+        old_getheader = self.resp.headers.get
 
         def _decode_header(string):
             if string is None:

test/unit/test_swiftclient.py

@@ -2003,6 +2003,7 @@ def test_response_headers(self):
         self.assertEqual(
             '\u062a-value', resp.getheader('\u062a-UNICODE'))
         self.assertEqual('', resp.getheader('empty-header'))
+        self.assertEqual('"%s"' % EMPTY_ETAG, resp.getheader('etag'))
         self.assertEqual(
             dict([('\u062a-unicode', '\u062a-value'),
                   ('empty-header', ''),