Skip to content

Commit f0132b5

Browse files
daniel-sanchedaniel-sanche
committed
use datetime.timezone.utc
1 parent 83d9f1b commit f0132b5

File tree

12 files changed

+30
-31
lines changed

12 files changed

+30
-31
lines changed

‎docs/classic_client/snippets.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
STORAGE_TYPE = enums.StorageType.SSD
5858
LABEL_KEY = "python-snippet"
5959
LABEL_STAMP = (
60-
datetime.datetime.now(datetime.UTC)
61-
.replace(microsecond=0, tzinfo=UTC)
60+
datetime.datetime.now(datetime.timezone.utc)
61+
.replace(microsecond=0)
6262
.strftime("%Y-%m-%dt%H-%M-%S")
6363
)
6464
LABELS = {LABEL_KEY: str(LABEL_STAMP)}

‎docs/classic_client/snippets_table.py‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
from test_utils.system import unique_resource_id
3838
from test_utils.retry import RetryErrors
3939

40-
from google.cloud._helpers import UTC
4140
from google.cloud.bigtable import Client
4241
from google.cloud.bigtable import enums
4342
from google.cloud.bigtable import column_family
@@ -54,8 +53,8 @@
5453
STORAGE_TYPE = enums.StorageType.SSD
5554
LABEL_KEY = "python-snippet"
5655
LABEL_STAMP = (
57-
datetime.datetime.now(datetime.UTC)
58-
.replace(microsecond=0, tzinfo=UTC)
56+
datetime.datetime.now(datetime.timezone.utc)
57+
.replace(microsecond=0)
5958
.strftime("%Y-%m-%dt%H-%M-%S")
6059
)
6160
LABELS = {LABEL_KEY: str(LABEL_STAMP)}
@@ -179,7 +178,7 @@ def test_bigtable_write_read_drop_truncate():
179178
value = "value_{}".format(i).encode()
180179
row = table.row(row_key)
181180
row.set_cell(
182-
COLUMN_FAMILY_ID, col_name, value, timestamp=datetime.datetime.now(datetime.UTC)
181+
COLUMN_FAMILY_ID, col_name, value, timestamp=datetime.datetime.now(datetime.timezone.utc)
183182
)
184183
rows.append(row)
185184
response = table.mutate_rows(rows)
@@ -270,7 +269,7 @@ def test_bigtable_mutations_batcher():
270269
row_key = row_keys[0]
271270
row = table.row(row_key)
272271
row.set_cell(
273-
COLUMN_FAMILY_ID, column_name, "value-0", timestamp=datetime.datetime.now(datetime.UTC)
272+
COLUMN_FAMILY_ID, column_name, "value-0", timestamp=datetime.datetime.now(datetime.timezone.utc)
274273
)
275274
batcher.mutate(row)
276275
# Add a collections of rows
@@ -279,7 +278,7 @@ def test_bigtable_mutations_batcher():
279278
row = table.row(row_keys[i])
280279
value = "value_{}".format(i).encode()
281280
row.set_cell(
282-
COLUMN_FAMILY_ID, column_name, value, timestamp=datetime.datetime.now(datetime.UTC)
281+
COLUMN_FAMILY_ID, column_name, value, timestamp=datetime.datetime.now(datetime.timezone.utc)
283282
)
284283
rows.append(row)
285284
batcher.mutate_rows(rows)
@@ -759,7 +758,7 @@ def test_bigtable_batcher_mutate_flush_mutate_rows():
759758
row_key = b"row_key_1"
760759
row = table.row(row_key)
761760
row.set_cell(
762-
COLUMN_FAMILY_ID, COL_NAME1, "value-0", timestamp=datetime.datetime.now(datetime.UTC)
761+
COLUMN_FAMILY_ID, COL_NAME1, "value-0", timestamp=datetime.datetime.now(datetime.timezone.utc)
763762
)
764763

765764
# In batcher, mutate will flush current batch if it
@@ -967,12 +966,12 @@ def test_bigtable_row_data_cells_cell_value_cell_values():
967966
value = b"value_in_col1"
968967
row = Config.TABLE.row(b"row_key_1")
969968
row.set_cell(
970-
COLUMN_FAMILY_ID, COL_NAME1, value, timestamp=datetime.datetime.now(datetime.UTC)
969+
COLUMN_FAMILY_ID, COL_NAME1, value, timestamp=datetime.datetime.now(datetime.timezone.utc)
971970
)
972971
row.commit()
973972

974973
row.set_cell(
975-
COLUMN_FAMILY_ID, COL_NAME1, value, timestamp=datetime.datetime.now(datetime.UTC)
974+
COLUMN_FAMILY_ID, COL_NAME1, value, timestamp=datetime.datetime.now(datetime.timezone.utc)
976975
)
977976
row.commit()
978977

@@ -1050,7 +1049,7 @@ def test_bigtable_row_setcell_rowkey():
10501049

10511050
cell_val = b"cell-val"
10521051
row.set_cell(
1053-
COLUMN_FAMILY_ID, COL_NAME1, cell_val, timestamp=datetime.datetime.now(datetime.UTC)
1052+
COLUMN_FAMILY_ID, COL_NAME1, cell_val, timestamp=datetime.datetime.now(datetime.timezone.utc)
10541053
)
10551054
# [END bigtable_api_row_set_cell]
10561055

‎samples/hello/main.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def main(project_id, instance_id, table_id):
8888
row_key = f"greeting{i}".encode()
8989
row = table.direct_row(row_key)
9090
row.set_cell(
91-
column_family_id, column, value, timestamp=datetime.datetime.now(datetime.UTC),
91+
column_family_id, column, value, timestamp=datetime.datetime.now(datetime.timezone.utc),
9292
)
9393
rows.append(row)
9494
table.mutate_rows(rows)

‎samples/snippets/writes/write_batch.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def write_batch(project_id, instance_id, table_id):
2525
table = instance.table(table_id)
2626

2727
with MutationsBatcher(table=table) as batcher:
28-
timestamp = datetime.datetime.now(datetime.UTC)
28+
timestamp = datetime.datetime.now(datetime.timezone.utc)
2929
column_family_id = "stats_summary"
3030

3131
rows = [

‎samples/snippets/writes/write_conditionally.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def write_conditional(project_id, instance_id, table_id):
2424
instance = client.instance(instance_id)
2525
table = instance.table(table_id)
2626

27-
timestamp = datetime.datetime.now(datetime.UTC)
27+
timestamp = datetime.datetime.now(datetime.timezone.utc)
2828
column_family_id = "stats_summary"
2929

3030
row_key = "phone#4c410523#20190501"

‎samples/snippets/writes/write_simple.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def write_simple(project_id, instance_id, table_id):
2424
instance = client.instance(instance_id)
2525
table = instance.table(table_id)
2626

27-
timestamp = datetime.datetime.now(datetime.UTC)
27+
timestamp = datetime.datetime.now(datetime.timezone.utc)
2828
column_family_id = "stats_summary"
2929

3030
row_key = "phone#4c410523#20190501"

‎tests/system/v2_client/_helpers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def _retry_on_unavailable(exc):
4141

4242
def label_stamp():
4343
return (
44-
datetime.datetime.now(datetime.UTC)
45-
.replace(microsecond=0, tzinfo=UTC)
44+
datetime.datetime.now(datetime.timezone.utc)
45+
.replace(microsecond=0)
4646
.strftime("%Y-%m-%dt%H-%M-%S")
4747
)

‎tests/system/v2_client/test_data_api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ def _write_to_row(row1, row2, row3, row4):
235235
from google.cloud._helpers import _microseconds_from_datetime
236236
from google.cloud.bigtable.row_data import Cell
237237

238-
timestamp1 = datetime.datetime.now(datetime.UTC)
238+
timestamp1 = datetime.datetime.now(datetime.timezone.utc)
239239
timestamp1_micros = _microseconds_from_datetime(timestamp1)
240240
# Truncate to millisecond granularity.
241241
timestamp1_micros -= timestamp1_micros % 1000

‎tests/unit/v2_client/test_backup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838

3939
def _make_timestamp():
40-
return datetime.datetime.now(datetime.UTC)
40+
return datetime.datetime.now(datetime.timezone.utc)
4141

4242

4343
def _make_table_admin_client():

‎tests/unit/v2_client/test_cluster.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ def test_cluster_create():
420420
from google.cloud.bigtable_admin_v2.types import instance as instance_v2_pb2
421421
from google.cloud.bigtable.enums import StorageType
422422

423-
NOW = datetime.datetime.now(datetime.UTC)
423+
NOW = datetime.datetime.now(datetime.timezone.utc)
424424
NOW_PB = _datetime_to_pb_timestamp(NOW)
425425
credentials = _make_credentials()
426426
client = _make_client(project=PROJECT, credentials=credentials, admin=True)
@@ -475,7 +475,7 @@ def test_cluster_create_w_cmek():
475475
from google.cloud.bigtable_admin_v2.types import instance as instance_v2_pb2
476476
from google.cloud.bigtable.enums import StorageType
477477

478-
NOW = datetime.datetime.now(datetime.UTC)
478+
NOW = datetime.datetime.now(datetime.timezone.utc)
479479
NOW_PB = _datetime_to_pb_timestamp(NOW)
480480
credentials = _make_credentials()
481481
client = _make_client(project=PROJECT, credentials=credentials, admin=True)
@@ -535,7 +535,7 @@ def test_cluster_create_w_autoscaling():
535535
from google.cloud.bigtable_admin_v2.types import instance as instance_v2_pb2
536536
from google.cloud.bigtable.enums import StorageType
537537

538-
NOW = datetime.datetime.now(datetime.UTC)
538+
NOW = datetime.datetime.now(datetime.timezone.utc)
539539
NOW_PB = _datetime_to_pb_timestamp(NOW)
540540
credentials = _make_credentials()
541541
client = _make_client(project=PROJECT, credentials=credentials, admin=True)
@@ -602,7 +602,7 @@ def test_cluster_update():
602602
)
603603
from google.cloud.bigtable.enums import StorageType
604604

605-
NOW = datetime.datetime.now(datetime.UTC)
605+
NOW = datetime.datetime.now(datetime.timezone.utc)
606606
NOW_PB = _datetime_to_pb_timestamp(NOW)
607607

608608
credentials = _make_credentials()
@@ -669,7 +669,7 @@ def test_cluster_update_w_autoscaling():
669669
)
670670
from google.cloud.bigtable.enums import StorageType
671671

672-
NOW = datetime.datetime.now(datetime.UTC)
672+
NOW = datetime.datetime.now(datetime.timezone.utc)
673673
NOW_PB = _datetime_to_pb_timestamp(NOW)
674674

675675
credentials = _make_credentials()
@@ -728,7 +728,7 @@ def test_cluster_update_w_partial_autoscaling_config():
728728
)
729729
from google.cloud.bigtable.enums import StorageType
730730

731-
NOW = datetime.datetime.now(datetime.UTC)
731+
NOW = datetime.datetime.now(datetime.timezone.utc)
732732
NOW_PB = _datetime_to_pb_timestamp(NOW)
733733

734734
credentials = _make_credentials()
@@ -812,7 +812,7 @@ def test_cluster_update_w_both_manual_and_autoscaling():
812812
)
813813
from google.cloud.bigtable.enums import StorageType
814814

815-
NOW = datetime.datetime.now(datetime.UTC)
815+
NOW = datetime.datetime.now(datetime.timezone.utc)
816816
NOW_PB = _datetime_to_pb_timestamp(NOW)
817817

818818
credentials = _make_credentials()
@@ -873,7 +873,7 @@ def test_cluster_disable_autoscaling():
873873
from google.cloud.bigtable.instance import Instance
874874
from google.cloud.bigtable.enums import StorageType
875875

876-
NOW = datetime.datetime.now(datetime.UTC)
876+
NOW = datetime.datetime.now(datetime.timezone.utc)
877877
NOW_PB = _datetime_to_pb_timestamp(NOW)
878878
credentials = _make_credentials()
879879
client = _make_client(project=PROJECT, credentials=credentials, admin=True)

0 commit comments

Comments
 (0)