Skip to content

Avoid surprising aiohttp with unexpected kwargs #6355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chlowell merged 1 commit into from
Jul 16, 2019
Merged

Avoid surprising aiohttp with unexpected kwargs #6355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions sdk/core/azure-core/azure/core/pipeline/transport/aiohttp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ async def close(self):
self._session_owner = False
self.session = None

def _build_ssl_config(self, **config):
verify = config.get('connection_verify', self.config.connection.verify)
cert = config.get('connection_cert', self.config.connection.cert)
def _build_ssl_config(self, cert, verify):
ssl_ctx = None

if cert or verify not in (True, False):
Expand Down Expand Up @@ -144,15 +142,18 @@ async def send(self, request: HttpRequest, **config: Any) -> Optional[AsyncHttpR
await self.open()
error = None
response = None
config['ssl'] = self._build_ssl_config(**config)
config['ssl'] = self._build_ssl_config(
cert=config.pop('connection_cert', self.config.connection.cert),
verify=config.pop('connection_verify', self.config.connection.verify)
)
try:
stream_response = config.pop("stream", False)
result = await self.session.request(
request.method,
request.url,
headers=request.headers,
data=self._get_request_data(request),
timeout=config.get('connection_timeout', self.config.connection.timeout),
timeout=config.pop('connection_timeout', self.config.connection.timeout),
allow_redirects=False,
**config
)
Expand Down