Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Review feedback
  • Loading branch information
annatisch committed Oct 2, 2019
commit 97104989eb93ca259387fa15be10828154b1d529
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@
"""
from typing import Dict, Any, Optional
import six
import requests
from requests.adapters import HTTPAdapter
from requests.packages.urllib3.util.retry import Retry
from azure.core.paging import ItemPaged # type: ignore
from azure.core import PipelineClient # type: ignore
from azure.core.pipeline.transport import RequestsTransport
from azure.core.pipeline.policies import ( # type: ignore
HTTPPolicy,
ContentDecodePolicy,
Expand Down Expand Up @@ -158,7 +156,7 @@ def __init__(
retry_policy = self.connection_policy.ConnectionRetryConfiguration
elif isinstance(self.connection_policy.ConnectionRetryConfiguration, int):
retry_policy = RetryPolicy(total=self.connection_policy.ConnectionRetryConfiguration)
elif self.connection_policy.ConnectionRetryConfiguration is not None:
elif isinstance(self.connection_policy.ConnectionRetryConfiguration, Retry):
# Convert a urllib3 retry policy to a Pipeline policy
retry_policy = RetryPolicy(
retry_total=self.connection_policy.ConnectionRetryConfiguration.total,
Expand All @@ -169,6 +167,8 @@ def __init__(
retry_on_status_codes=list(self.connection_policy.ConnectionRetryConfiguration.status_forcelist),
retry_backoff_factor=self.connection_policy.ConnectionRetryConfiguration.backoff_factor
)
else:
TypeError("Unsupported retry policy. Must be an azure.core.RetryPolicy, integer, or urllib3.Retry")

proxies = kwargs.pop('proxies', {})
if self.connection_policy.ProxyConfiguration and self.connection_policy.ProxyConfiguration.Host:
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos/azure/cosmos/cosmos_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"""Create, read, and delete databases in the Azure Cosmos DB SQL API service.
"""

from typing import Any, Dict, Mapping, Optional, Union, cast, Iterable, List
from typing import Any, Dict, Mapping, Optional, Union, cast, Iterable, List # pylint: disable=unused-import

import six
from azure.core.tracing.decorator import distributed_trace # type: ignore
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/azure-cosmos/azure/cosmos/documents.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ class ConnectionPolicy(object): # pylint: disable=too-many-instance-attributes
Flag to enable writes on any locations (regions) for geo-replicated database accounts
in the azure Cosmos service.
:ivar ConnectionRetryConfiguration:
Retry Configuration to be used for urllib3 connection retries.
Retry Configuration to be used for connection retries.
:vartype ConnectionRetryConfiguration:
int or requests.packages.urllib3.util.retry or azure.core.pipeline.policies.HTTPPolicy
"""
Expand Down