Skip to content

Commit 621a3fd

Browse files
committed
fix: fix DeprecationWarning in write API
Was getting this warning using the client with Python 3.9: ``` /lib/python3.9/site-packages/influxdb_client/client/write/retry.py:47: DeprecationWarning: Using 'method_whitelist' with Retry is deprecated and will be removed in v2.0. Use 'allowed_methods' instead super().__init__(**kw) ``` This commit should fix things.
1 parent 4fc41d2 commit 621a3fd

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
1. [#412](https://github.com/influxdata/influxdb-client-python/pull/412): `DeleteApi` uses default value from `InfluxDBClient.org` if an `org` parameter is not specified
55
1. [#405](https://github.com/influxdata/influxdb-client-python/pull/405): Add `InfluxLoggingHandler`. A handler to use the client in native python logging.
66
1. [#404](https://github.com/influxdata/influxdb-client-python/pull/404): Add `InvocableScriptsApi` to create, update, list, delete and invoke scripts by seamless way
7+
1. [#419](https://github.com/influxdata/influxdb-client-python/pull/419): Bump urllib3 to 1.26.0 and change `method_whitelist` to `allowed_methods` to clear deprecation warning
78

89
### CI
910
1. [#411](https://github.com/influxdata/influxdb-client-python/pull/411): Use new Codecov uploader for reporting code coverage

influxdb_client/client/write_api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def to_retry_strategy(self, **kwargs):
9595
max_retry_time=self.max_retry_time / 1_000,
9696
exponential_base=self.exponential_base,
9797
retry_callback=kwargs.get("retry_callback", None),
98-
method_whitelist=["POST"])
98+
allowed_methods=["POST"])
9999

100100
def __getstate__(self):
101101
"""Return a dict of attributes that you want to pickle."""

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'six >= 1.10',
1111
'python_dateutil >= 2.5.3',
1212
'setuptools >= 21.0.0',
13-
'urllib3 >= 1.15.1',
13+
'urllib3 >= 1.26.0',
1414
'pytz>=2019.1'
1515
]
1616

tests/test_WriteOptions.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def test_default(self):
1212
self.assertEqual(retry.max_retry_time, 180)
1313
self.assertEqual(retry.max_retry_delay, 125)
1414
self.assertEqual(retry.exponential_base, 2)
15-
self.assertEqual(retry.method_whitelist, ["POST"])
15+
self.assertEqual(retry.allowed_methods, ["POST"])
1616

1717
def test_custom(self):
1818
retry = WriteOptions(max_retries=5, max_retry_delay=7500,
@@ -24,4 +24,4 @@ def test_custom(self):
2424
self.assertEqual(retry.retry_interval, 0.5)
2525
self.assertEqual(retry.max_retry_delay, 7.5)
2626
self.assertEqual(retry.exponential_base, 2)
27-
self.assertEqual(retry.method_whitelist, ["POST"])
27+
self.assertEqual(retry.allowed_methods, ["POST"])

tests/test_WritesRetry.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -184,27 +184,27 @@ def test_get_retry_after_jitter(self):
184184
self.assertLessEqual(retry_after, 7)
185185

186186
def test_is_retry(self):
187-
retry = WritesRetry(method_whitelist=["POST"])
187+
retry = WritesRetry(allowed_methods=["POST"])
188188

189189
self.assertTrue(retry.is_retry("POST", 429, True))
190190

191191
def test_is_retry_428(self):
192-
retry = WritesRetry(method_whitelist=["POST"])
192+
retry = WritesRetry(allowed_methods=["POST"])
193193

194194
self.assertFalse(retry.is_retry("POST", 428, True))
195195

196196
def test_is_retry_430(self):
197-
retry = WritesRetry(method_whitelist=["POST"])
197+
retry = WritesRetry(allowed_methods=["POST"])
198198

199199
self.assertTrue(retry.is_retry("POST", 430, True))
200200

201201
def test_is_retry_retry_after_header_is_not_required(self):
202-
retry = WritesRetry(method_whitelist=["POST"])
202+
retry = WritesRetry(allowed_methods=["POST"])
203203

204204
self.assertTrue(retry.is_retry("POST", 429, False))
205205

206206
def test_is_retry_respect_method(self):
207-
retry = WritesRetry(method_whitelist=["POST"])
207+
retry = WritesRetry(allowed_methods=["POST"])
208208

209209
self.assertFalse(retry.is_retry("GET", 429, False))
210210

0 commit comments

Comments
 (0)