Skip to content

docs: replace calls to __del__ with calls to close #200

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.

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
merged 1 commit into from
Mar 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
### Bug Fixes
1. [#193](https://github.com/influxdata/influxdb-client-python/pull/193): Fixed `tasks_api` to use proper function to get `Run`

### Documentation
1. [#200](https://github.com/influxdata/influxdb-client-python/pull/200): Updated docs, examples, tests: use `close` instead of `__del__`.

## 1.14.0 [2021-01-29]

### Features
Expand Down
24 changes: 12 additions & 12 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@ The batching is configurable by ``write_options``\ :
"""
Close client
"""
_write_client.__del__()
_client.__del__()
_write_client.close()
_client.close()

.. marker-batching-end

Expand Down Expand Up @@ -436,7 +436,7 @@ Data are writes in an asynchronous HTTP request.
async_result = write_api.write(bucket="my-bucket", record=[_point1, _point2])
async_result.get()

client.__del__()
client.close()

Synchronous client
""""""""""""""""""
Expand All @@ -456,7 +456,7 @@ Data are writes in a synchronous HTTP request.

write_api.write(bucket="my-bucket", record=[_point1, _point2])

client.__del__()
client.close()

Queries
^^^^^^^
Expand Down Expand Up @@ -537,7 +537,7 @@ The API also support streaming ``FluxRecord`` via `query_stream <https://github.
"""
Close client
"""
client.__del__()
client.close()

Pandas DataFrame
""""""""""""""""
Expand Down Expand Up @@ -580,7 +580,7 @@ The ``client`` is able to retrieve data in `Pandas DataFrame <https://pandas.pyd
"""
Close client
"""
client.__del__()
client.close()

Output:

Expand Down Expand Up @@ -677,7 +677,7 @@ If you would like to import gigabytes of data then use our multiprocessing examp
Write data into InfluxDB
"""
write_api.write(bucket="my-bucket", record=data)
write_api.__del__()
write_api.close()

"""
Querying max value of CBOE Volatility Index
Expand All @@ -701,7 +701,7 @@ If you would like to import gigabytes of data then use our multiprocessing examp
"""
Close client
"""
client.__del__()
client.close()

.. marker-writes-end

Expand Down Expand Up @@ -734,8 +734,8 @@ Efficiency write data from IOT sensor
:param write_api: WriteApi
:return: nothing
"""
write_api.__del__()
db_client.__del__()
write_api.close()
db_client.close()


def sensor_temperature():
Expand Down Expand Up @@ -930,7 +930,7 @@ The `delete_api.py <influxdb_client/client/delete_api.py>`_ supports deletes `po
"""
Close client
"""
client.__del__()
client.close()

.. marker-delete-end

Expand Down Expand Up @@ -1031,7 +1031,7 @@ that is replacement for python ``datetime.datetime`` object and also you should
"""
Close client
"""
client.__del__()
client.close()


Local tests
Expand Down
4 changes: 2 additions & 2 deletions examples/import_data_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def parse_row(row: OrderedDict):
Write data into InfluxDB
"""
write_api.write(bucket="my-bucket", record=data)
write_api.__del__()
write_api.close()

"""
Querying max value of CBOE Volatility Index
Expand All @@ -95,4 +95,4 @@ def parse_row(row: OrderedDict):
"""
Close client
"""
client.__del__()
client.close()
6 changes: 3 additions & 3 deletions examples/import_data_set_multiprocessing.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ def terminate(self) -> None:
proc_name = self.name
print()
print('Writer: flushing data...')
self.write_api.__del__()
self.client.__del__()
self.write_api.close()
self.client.close()
print('Writer: closed'.format(proc_name))


Expand Down Expand Up @@ -216,4 +216,4 @@ def init_counter(counter, progress, queue):
"""
Close client
"""
client.__del__()
client.close()
2 changes: 1 addition & 1 deletion examples/influxdb_18_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
print(point.to_line_protocol())

write_api.write(bucket=bucket, record=point)
write_api.__del__()
write_api.close()

print('*** Query Points ***')

Expand Down
2 changes: 1 addition & 1 deletion examples/ingest_dataframe_default_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@
"""
Close client
"""
client.__del__()
client.close()
4 changes: 2 additions & 2 deletions examples/iot_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ def on_exit(db_client: InfluxDBClient, write_api: WriteApi):
:param write_api: WriteApi
:return: nothing
"""
write_api.__del__()
db_client.__del__()
write_api.close()
db_client.close()


def sensor_temperature():
Expand Down
2 changes: 1 addition & 1 deletion examples/nanosecond_precision.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@
"""
Close client
"""
client.__del__()
client.close()
2 changes: 1 addition & 1 deletion examples/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@
"""
Close client
"""
client.__del__()
client.close()
2 changes: 1 addition & 1 deletion examples/query_from_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"""
Close client
"""
client.__del__()
client.close()



Expand Down
7 changes: 5 additions & 2 deletions examples/rx_playground.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ def __init__(self) -> None:
.subscribe(self._result, self._error, self._on_complete)
pass

def close(self):
self.__del__()

def __del__(self):
if self._subject:
self._subject.on_completed()
Expand Down Expand Up @@ -179,8 +182,8 @@ def _group_to_batch(group: GroupedObservable):
print("\n== finish writing ==\n")
time.sleep(5)

print("\n== __del__ ==\n")
rxWriter.__del__()
print("\n== close ==\n")
rxWriter.close()

print("\n== finished ==\n")

Expand Down
4 changes: 2 additions & 2 deletions notebooks/stock_predictions_import_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def main():
write_api = client.write_api(write_options=WriteOptions(batch_size=50_000, flush_interval=10_000))

write_api.write(bucket="my-bucket", record=data)
write_api.__del__()
write_api.close()

query = '''
from(bucket:"my-bucket")
Expand All @@ -78,7 +78,7 @@ def main():
"""
Close client
"""
client.__del__()
client.close()
# %%


Expand Down
4 changes: 2 additions & 2 deletions tests/test_QueryApiDataFrame.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def setUp(self) -> None:
httpretty.reset()

def tearDown(self) -> None:
self.client.__del__()
self.client.close()
httpretty.disable()

def test_one_table(self):
Expand Down Expand Up @@ -276,7 +276,7 @@ def _create_point(index) -> Point:

write_api = self.client.write_api(write_options=WriteOptions(batch_size=500))
write_api.write(org="my-org", bucket="my-bucket", record=data, write_precision=WritePrecision.S)
write_api.__del__()
write_api.close()

query = 'from(bucket: "my-bucket")' \
'|> range(start: 2020-02-19T23:30:00Z, stop: now())' \
Expand Down
2 changes: 1 addition & 1 deletion tests/test_QueryApiStream.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def setUp(self) -> None:
self.bucket = self.create_test_bucket()

def tearDown(self) -> None:
self.write_client.__del__()
self.write_client.close()
super().tearDown()

def test_block(self):
Expand Down
12 changes: 6 additions & 6 deletions tests/test_WriteApi.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def setUp(self) -> None:
'${env.data_center}'}))

def tearDown(self) -> None:
self.write_client.__del__()
self.write_client.close()
super().tearDown()

def test_write_line_protocol(self):
Expand Down Expand Up @@ -425,7 +425,7 @@ def test_check_write_permission_by_empty_data(self):
self.assertEqual(401, exception.status)
self.assertEqual("Unauthorized", exception.reason)

client.__del__()
client.close()

def test_write_query_data_nanoseconds(self):

Expand Down Expand Up @@ -477,7 +477,7 @@ def setUp(self) -> None:
self.influxdb_client = InfluxDBClient(url=conf.host, token="my-token")

def tearDown(self) -> None:
self.influxdb_client.__del__()
self.influxdb_client.close()
httpretty.disable()

def test_writes_synchronous_without_retry(self):
Expand Down Expand Up @@ -521,7 +521,7 @@ def setUp(self) -> None:
'${env.data_center}'}))

def tearDown(self) -> None:
self.write_client.__del__()
self.write_client.close()
super().tearDown()

def test_write_result(self):
Expand Down Expand Up @@ -723,7 +723,7 @@ def setUp(self) -> None:
self.customer_tag = "California Miner"

def tearDown(self) -> None:
self.write_client.__del__()
self.write_client.close()
super().tearDown()

def test_point_settings(self):
Expand Down Expand Up @@ -773,7 +773,7 @@ def setUp(self) -> None:
os.environ['INFLUXDB_V2_TAG_DATA_CENTER'] = "${env.data_center}"

def tearDown(self) -> None:
self.write_client.__del__()
self.write_client.close()
super().tearDown()

def test_connection_option_from_conf_file(self):
Expand Down
16 changes: 8 additions & 8 deletions tests/test_WriteApiBatching.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def setUp(self) -> None:
self._write_client = WriteApi(influxdb_client=self.influxdb_client, write_options=self.write_options)

def tearDown(self) -> None:
self._write_client.__del__()
self._write_client.close()
httpretty.disable()

def test_batch_size(self):
Expand Down Expand Up @@ -150,7 +150,7 @@ def test_flush_interval(self):
httpretty.httpretty.latest_requests[1].parsed_body)

def test_jitter_interval(self):
self._write_client.__del__()
self._write_client.close()
self._write_client = WriteApi(influxdb_client=self.influxdb_client,
write_options=WriteOptions(batch_size=2, flush_interval=5_000,
jitter_interval=3_000))
Expand Down Expand Up @@ -179,7 +179,7 @@ def test_jitter_interval(self):

def test_retry_interval(self):

self._write_client.__del__()
self._write_client.close()

# Set retry interval to 1_500
self.write_options = WriteOptions(batch_size=2, flush_interval=5_000, retry_interval=1_500)
Expand Down Expand Up @@ -226,7 +226,7 @@ def test_retry_interval_max_retries(self):
httpretty.register_uri(httpretty.POST, uri="http://localhost/api/v2/write", status=429,
adding_headers={'Retry-After': '1'})

self._write_client.__del__()
self._write_client.close()
self._write_client = WriteApi(influxdb_client=self.influxdb_client,
write_options=WriteOptions(batch_size=2, flush_interval=5_000, max_retries=5))

Expand Down Expand Up @@ -380,15 +380,15 @@ def test_del(self):
_record = "h2o_feet,location=coyote_creek level\\ water_level=1 1"
_result = self._write_client.write("my-bucket", "my-org", _record)

self._write_client.__del__()
self._write_client.close()

_requests = httpretty.httpretty.latest_requests

self.assertEqual(1, len(_requests))
self.assertEqual("h2o_feet,location=coyote_creek level\\ water_level=1 1", _requests[0].parsed_body)

def test_default_tags(self):
self._write_client.__del__()
self._write_client.close()

self.id_tag = "132-987-655"
self.customer_tag = "California Miner"
Expand Down Expand Up @@ -431,7 +431,7 @@ def test_user_agent_header(self):

def test_to_low_flush_interval(self):

self._write_client.__del__()
self._write_client.close()
self._write_client = WriteApi(influxdb_client=self.influxdb_client,
write_options=WriteOptions(batch_size=8,
flush_interval=1,
Expand All @@ -448,7 +448,7 @@ def test_to_low_flush_interval(self):
self._write_client.write("my-bucket", "my-org", [point_one, point_two])
time.sleep(0.1)

self._write_client.__del__()
self._write_client.close()

_requests = httpretty.httpretty.latest_requests

Expand Down
4 changes: 2 additions & 2 deletions tests/test_WriteApiDataFrame.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def setUp(self) -> None:

def tearDown(self) -> None:
super().tearDown()
self._write_client.__del__()
self._write_client.close()

def test_write_num_py(self):
from influxdb_client.extras import pd, np
Expand All @@ -38,7 +38,7 @@ def test_write_num_py(self):
write_api.write(bucket.name, record=data_frame, data_frame_measurement_name='h2o_feet',
data_frame_tag_columns=['location'])

write_api.__del__()
write_api.close()

result = self.query_api.query(
"from(bucket:\"" + bucket.name + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)",
Expand Down
Loading