fix: url version

Author: dfana01

integration_test/base.py

@@ -94,7 +94,7 @@ def campaign(self):
                         start_time=None,
                         end_time=None,
                         objective_type=ObjectiveType("AWARENESS"),
-                        is_campaign_budget_optimization=False,
+                        is_campaign_budget_optimization=True,
                         is_flexible_daily_budgets=False,
                         default_ad_group_budget_in_micro_currency=None,
                         is_automated_campaign=False,

openapi_generated/pinterest_client/api_client.py

@@ -221,7 +221,7 @@ def __call_api(
         if response_type:
             if response_type != (file_type,):
                 encoding = "utf-8"
-                content_type = response_data.getheader('content-type')
+                content_type = response_data.urllib3_response.headers.get('content-type')
                 if content_type is not None:
                     match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type)
                     if match:
@@ -240,7 +240,7 @@ def __call_api(
             return (return_data)
         else:
             return (return_data, response_data.status,
-                    response_data.getheaders())
+                    response_data.urllib3_response.headers)
 
     def parameters_to_multipart(self, params, collection_types):
         """Get parameters as list of tuples, formatting as json if value is collection_types
@@ -317,7 +317,7 @@ def deserialize(self, response, response_type, _check_type):
         # handle file downloading
         # save response body into a tmp file and return the instance
         if response_type == (file_type,):
-            content_disposition = response.getheader("Content-Disposition")
+            content_disposition = response.urllib3_response.headers.get("Content-Disposition")
             return deserialize_file(response.data, self.configuration,
                                     content_disposition=content_disposition)
 

openapi_generated/pinterest_client/exceptions.py

@@ -104,7 +104,7 @@ def __init__(self, status=None, reason=None, http_resp=None):
             self.status = http_resp.status
             self.reason = http_resp.reason
             self.body = http_resp.data
-            self.headers = http_resp.getheaders()
+            self.headers = http_resp.urllib3_response.headers
         else:
             self.status = status
             self.reason = reason

openapi_generated/pinterest_client/rest.py

@@ -36,11 +36,11 @@ def __init__(self, resp):
 
     def getheaders(self):
         """Returns a dictionary of the response headers."""
-        return self.urllib3_response.getheaders()
+        return self.urllib3_response.headers
 
     def getheader(self, name, default=None):
         """Returns a given response header."""
-        return self.urllib3_response.getheader(name, default)
+        return self.urllib3_response.headers.get(name, default)
 
 
 class RESTClientObject(object):

requirements.txt

@@ -1,3 +1,3 @@
 python_dateutil >= 2.5.3
 setuptools >= 21.0.0
-urllib3 == 2.5.0
+urllib3>=1.26,<3

setup.py

@@ -31,7 +31,7 @@
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-  "urllib3==1.26.20",
+  "urllib3>=1.26,<3",
   "python-dateutil",
 ]
 

spec/Makefile

@@ -26,8 +26,9 @@ generate_client:			## Generates a python client
 	rm -rf ../test ../.gitlab-ci.yml ../.travis.yml ../git_push.sh
 
 patch_client:			## Patch the generated client
-	@echo ====Execiting patches====
+	@echo ====Executing patches====
 	python ./patches/remove_bool_none_type.py
+	python ./patches/fix_urllib3_deprecations.py
 
 help:								## Show list of targets and purposes.
 	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'

spec/patches/fix_urllib3_deprecations.py

@@ -0,0 +1,74 @@
+"""
+This script fixes deprecated urllib3 methods in the generated code by replacing:
+- response.getheader('content-type') → response.headers.get('content-type')
+- response.getheaders() → response.headers
+
+This addresses deprecation warnings that will become breaking errors in urllib3 2.6.0.
+Based on urllib3 v2.0 migration guide: https://urllib3.readthedocs.io/en/stable/v2-migration-guide.html
+
+Files affected:
+- openapi_generated/pinterest_client/rest.py (lines 37-43)
+- openapi_generated/pinterest_client/api_client.py (lines 224, 243, 320)
+- openapi_generated/pinterest_client/exceptions.py (line 107)
+"""
+import os
+import re
+
+directory = '../openapi_generated'
+
+# Define the replacements - apply multiple times until no more changes
+def apply_replacements(content):
+    """Apply all replacements until no more changes are made"""
+    original_content = content
+    
+    # First: Clean up any multiple urllib3_response references (make it idempotent)
+    content = re.sub(r'(\.urllib3_response)+', '.urllib3_response', content)
+    
+    # Second: Replace deprecated getheader() calls with headers.get()
+    # All response objects are RESTResponse wrappers, so use .urllib3_response.headers
+    content = re.sub(r'(response_data|response|http_resp)\.getheader\(([^)]+)\)', r'\1.urllib3_response.headers.get(\2)', content)
+    
+    # Third: Replace deprecated getheaders() calls with headers
+    # All response objects are RESTResponse wrappers, so use .urllib3_response.headers
+    content = re.sub(r'(response_data|response|http_resp)\.getheaders\(\)', r'\1.urllib3_response.headers', content)
+    
+    return content
+
+print("Starting the script to fix deprecated urllib3 methods in the 'openapi_generated' directory...")
+print("This ensures compatibility with both urllib3 1.x and 2.x")
+
+files_modified = 0
+total_replacements = 0
+
+for root, dirs, files in os.walk(directory):
+    for file in files:
+        if file.endswith(".py"):
+            file_path = os.path.join(root, file)
+            
+            try:
+                with open(file_path, 'r', encoding='utf-8') as f:
+                    content = f.read()
+                
+                original_content = content
+                
+                # Apply all replacements using the function
+                content = apply_replacements(content)
+                
+                # Write back if changes were made
+                if content != original_content:
+                    with open(file_path, 'w', encoding='utf-8') as f:
+                        f.write(content)
+                    
+                    # Count replacements made in this file
+                    file_replacements = len(original_content) - len(content) + content.count('urllib3_response') - original_content.count('urllib3_response')
+                    
+                    print(f"Modified: {file_path} ({file_replacements} replacements)")
+                    files_modified += 1
+                    total_replacements += file_replacements
+                    
+            except Exception as e:
+                print(f"Error processing {file_path}: {e}")
+
+print(f"Script completed. Modified {files_modified} files with {total_replacements} total replacements.")
+print("Deprecated urllib3 methods have been updated to use the new headers API.")
+print("Your package now supports both urllib3 1.x and 2.x!")