Merge pull request #1 from Haxe18/fix/curl-cffi-0.14.0-compatibility

fix: add compatibility for curl_cffi >= 0.14.0 and urllib3 >= 2.6.0

Author: el1s7

curl_adapter/curl_cffi.py

@@ -191,5 +191,10 @@ def set_curl_options(self, curl, request, url, timeout, proxies):
 				)
 
 	def reset_curl(self):
-		self.curl.clean_after_perform()
+		if hasattr(self.curl, 'clean_handles_and_buffers'):
+			# curl_cffi >= 0.14.0: clean_after_perform() was renamed to clean_handles_and_buffers()
+			self.curl.clean_handles_and_buffers()
+		elif hasattr(self.curl, 'clean_after_perform'):
+			# curl_cffi < 0.14.0
+			self.curl.clean_after_perform()
 		return super().reset_curl()

curl_adapter/stream/response.py

@@ -203,13 +203,16 @@ def _error_catcher(self):
 			#self.close()
 			pass
 
-	def _decode(self, data, decode_content, flush_decoder):
+	def _decode(self, data, decode_content, flush_decoder, max_length=None):
 		"""
 			Curl automatically decodes content if the "Accept" header is present.
 		"""
 		if not self._handle_content_decoding:
 			return data
 
+		# urllib3 >= 2.6.0 passes max_length parameter
+		if max_length is not None:
+			return super()._decode(data, decode_content, flush_decoder, max_length)
 		return super()._decode(data, decode_content, flush_decoder)
 
 
@@ -241,4 +244,4 @@ def connection(self):
 
 	@classmethod
 	def from_httplib(self, *args, **kwargs):
-		raise NotImplementedError()
+		raise NotImplementedError()