Update v2 array parameter serialization to use indexed format

stripe/_api_requestor.py

@@ -600,7 +600,7 @@ def _args_for_request_with_retries(
                 **params,
             }
 
-        encoded_params = urlencode(list(_api_encode(params or {}, api_mode)))
+        encoded_params = urlencode(list(_api_encode(params or {})))
 
         # Don't use strict form encoding by changing the square bracket control
         # characters back to their literals. This is fine by the server, and

stripe/_encode.py

@@ -2,7 +2,7 @@
 import datetime
 import time
 from collections import OrderedDict
-from typing import Generator, Optional, Tuple, Any
+from typing import Generator, Tuple, Any
 
 
 def _encode_datetime(dttime: datetime.datetime):
@@ -27,26 +27,25 @@ def _json_encode_date_callback(value):
     return value
 
 
-def _api_encode(
-    data, api_mode: Optional[str]
-) -> Generator[Tuple[str, Any], None, None]:
+def _api_encode(data) -> Generator[Tuple[str, Any], None, None]:
     for key, value in data.items():
         if value is None:
             continue
         elif hasattr(value, "stripe_id"):
             yield (key, value.stripe_id)
         elif isinstance(value, list) or isinstance(value, tuple):
             for i, sv in enumerate(value):
-                encoded_key = key if api_mode == "V2" else "%s[%d]" % (key, i)
+                # Always use indexed format for arrays
+                encoded_key = "%s[%d]" % (key, i)
                 if isinstance(sv, dict):
                     subdict = _encode_nested_dict(encoded_key, sv)
-                    for k, v in _api_encode(subdict, api_mode):
+                    for k, v in _api_encode(subdict):
                         yield (k, v)
                 else:
                     yield (encoded_key, sv)
         elif isinstance(value, dict):
             subdict = _encode_nested_dict(key, value)
-            for subkey, subvalue in _api_encode(subdict, api_mode):
+            for subkey, subvalue in _api_encode(subdict):
                 yield (subkey, subvalue)
         elif isinstance(value, datetime.datetime):
             yield (key, _encode_datetime(value))

stripe/_multipart_data_generator.py

@@ -19,7 +19,7 @@ def __init__(self, chunk_size: int = 1028):
     def add_params(self, params):
         # Flatten parameters first
 
-        params = dict(_api_encode(params, "V1"))
+        params = dict(_api_encode(params))
 
         for key, value in params.items():
             if value is None:

stripe/_oauth.py

@@ -323,7 +323,7 @@ def authorize_url(
         OAuth._set_client_id(params)
         if "response_type" not in params:
             params["response_type"] = "code"
-        query = urlencode(list(_api_encode(params, "V1")))
+        query = urlencode(list(_api_encode(params)))
         url = connect_api_base + path + "?" + query
         return url
 

stripe/_oauth_service.py

@@ -64,7 +64,7 @@ def authorize_url(
         self._set_client_id(params)
         if "response_type" not in params:
             params["response_type"] = "code"
-        query = urlencode(list(_api_encode(params, "V1")))
+        query = urlencode(list(_api_encode(params)))
 
         # connect_api_base will be always set to stripe.DEFAULT_CONNECT_API_BASE
         # if it is not overridden on the client explicitly.

tests/test_api_requestor.py

@@ -220,7 +220,7 @@ def test_encodes_null_values_preview(self, requestor, http_client_mock):
 
     def test_dictionary_list_encoding(self):
         params = {"foo": {"0": {"bar": "bat"}}}
-        encoded = list(_api_encode(params, "V1"))
+        encoded = list(_api_encode(params))
         key, value = encoded[0]
 
         assert key == "foo[0][bar]"
@@ -237,7 +237,7 @@ def test_ordereddict_encoding(self):
                 ]
             )
         }
-        encoded = list(_api_encode(params, "V1"))
+        encoded = list(_api_encode(params))
 
         assert encoded[0][0] == "ordered[one]"
         assert encoded[1][0] == "ordered[two]"

tests/test_http_client.py

@@ -1176,26 +1176,26 @@ class TestAPIEncode:
     def test_encode_dict(self):
         body = {"foo": {"dob": {"month": 1}, "name": "bat"}}
 
-        values = [t for t in _api_encode(body, "V1")]
+        values = [t for t in _api_encode(body)]
 
         assert ("foo[dob][month]", 1) in values
         assert ("foo[name]", "bat") in values
 
     def test_encode_array(self):
         body = {"foo": [{"dob": {"month": 1}, "name": "bat"}]}
 
-        values = [t for t in _api_encode(body, "V1")]
+        values = [t for t in _api_encode(body)]
 
         assert ("foo[0][dob][month]", 1) in values
         assert ("foo[0][name]", "bat") in values
 
     def test_encode_v2_array(self):
         body = {"foo": [{"dob": {"month": 1}, "name": "bat"}]}
 
-        values = [t for t in _api_encode(body, "V2")]
+        values = [t for t in _api_encode(body)]
 
-        assert ("foo[dob][month]", 1) in values
-        assert ("foo[name]", "bat") in values
+        assert ("foo[0][dob][month]", 1) in values
+        assert ("foo[0][name]", "bat") in values
 
 
 class TestHTTPXClient(ClientTestBase):