changed import

Author: daniel-sanche

docs/classic_client/snippets.py

@@ -29,7 +29,7 @@
 
 """
 
-import datetime
+from datetime import datetime, timezone
 import pytest
 
 from google.api_core.exceptions import DeadlineExceeded
@@ -39,7 +39,7 @@
 from test_utils.system import unique_resource_id
 from test_utils.retry import RetryErrors
 
-from google.cloud._helpers import UTC
+
 from google.cloud.bigtable import Client
 from google.cloud.bigtable import enums
 
@@ -57,7 +57,7 @@
 STORAGE_TYPE = enums.StorageType.SSD
 LABEL_KEY = "python-snippet"
 LABEL_STAMP = (
-    datetime.datetime.now(datetime.timezone.utc)
+    datetime.now(timezone.utc)
     .replace(microsecond=0)
     .strftime("%Y-%m-%dt%H-%M-%S")
 )

docs/classic_client/snippets_table.py

@@ -29,7 +29,7 @@
 
 """
 
-import datetime
+from datetime import datetime, timezone
 import pytest
 
 from google.api_core.exceptions import TooManyRequests
@@ -53,7 +53,7 @@
 STORAGE_TYPE = enums.StorageType.SSD
 LABEL_KEY = "python-snippet"
 LABEL_STAMP = (
-    datetime.datetime.now(datetime.timezone.utc)
+    datetime.now(timezone.utc)
     .replace(microsecond=0)
     .strftime("%Y-%m-%dt%H-%M-%S")
 )
@@ -178,7 +178,7 @@ def test_bigtable_write_read_drop_truncate():
         value = "value_{}".format(i).encode()
         row = table.row(row_key)
         row.set_cell(
-            COLUMN_FAMILY_ID, col_name, value, timestamp=datetime.datetime.now(datetime.timezone.utc)
+            COLUMN_FAMILY_ID, col_name, value, timestamp=datetime.now(timezone.utc)
         )
         rows.append(row)
     response = table.mutate_rows(rows)
@@ -269,7 +269,7 @@ def test_bigtable_mutations_batcher():
     row_key = row_keys[0]
     row = table.row(row_key)
     row.set_cell(
-        COLUMN_FAMILY_ID, column_name, "value-0", timestamp=datetime.datetime.now(datetime.timezone.utc)
+        COLUMN_FAMILY_ID, column_name, "value-0", timestamp=datetime.now(timezone.utc)
     )
     batcher.mutate(row)
     # Add a collections of rows
@@ -278,7 +278,7 @@ def test_bigtable_mutations_batcher():
         row = table.row(row_keys[i])
         value = "value_{}".format(i).encode()
         row.set_cell(
-            COLUMN_FAMILY_ID, column_name, value, timestamp=datetime.datetime.now(datetime.timezone.utc)
+            COLUMN_FAMILY_ID, column_name, value, timestamp=datetime.now(timezone.utc)
         )
         rows.append(row)
     batcher.mutate_rows(rows)
@@ -758,7 +758,7 @@ def test_bigtable_batcher_mutate_flush_mutate_rows():
     row_key = b"row_key_1"
     row = table.row(row_key)
     row.set_cell(
-        COLUMN_FAMILY_ID, COL_NAME1, "value-0", timestamp=datetime.datetime.now(datetime.timezone.utc)
+        COLUMN_FAMILY_ID, COL_NAME1, "value-0", timestamp=datetime.now(timezone.utc)
     )
 
     # In batcher, mutate will flush current batch if it
@@ -966,12 +966,12 @@ def test_bigtable_row_data_cells_cell_value_cell_values():
     value = b"value_in_col1"
     row = Config.TABLE.row(b"row_key_1")
     row.set_cell(
-        COLUMN_FAMILY_ID, COL_NAME1, value, timestamp=datetime.datetime.now(datetime.timezone.utc)
+        COLUMN_FAMILY_ID, COL_NAME1, value, timestamp=datetime.now(timezone.utc)
     )
     row.commit()
 
     row.set_cell(
-        COLUMN_FAMILY_ID, COL_NAME1, value, timestamp=datetime.datetime.now(datetime.timezone.utc)
+        COLUMN_FAMILY_ID, COL_NAME1, value, timestamp=datetime.now(timezone.utc)
     )
     row.commit()
 
@@ -1049,7 +1049,7 @@ def test_bigtable_row_setcell_rowkey():
 
     cell_val = b"cell-val"
     row.set_cell(
-        COLUMN_FAMILY_ID, COL_NAME1, cell_val, timestamp=datetime.datetime.now(datetime.timezone.utc)
+        COLUMN_FAMILY_ID, COL_NAME1, cell_val, timestamp=datetime.now(timezone.utc)
     )
     # [END bigtable_api_row_set_cell]
 

samples/hello/main.py

@@ -28,7 +28,7 @@
 from ..utils import wait_for_table
 
 # [START bigtable_hw_imports]
-import datetime
+from datetime import datetime, timezone
 
 from google.cloud import bigtable
 from google.cloud.bigtable import column_family
@@ -88,7 +88,7 @@ def main(project_id, instance_id, table_id):
             row_key = f"greeting{i}".encode()
             row = table.direct_row(row_key)
             row.set_cell(
-                column_family_id, column, value, timestamp=datetime.datetime.now(datetime.timezone.utc),
+                column_family_id, column, value, timestamp=datetime.now(timezone.utc),
             )
             rows.append(row)
         table.mutate_rows(rows)

samples/snippets/writes/write_batch.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # [START bigtable_writes_batch]
-import datetime
+from datetime import datetime, timezone
 
 from google.cloud import bigtable
 from google.cloud.bigtable.batcher import MutationsBatcher
@@ -25,7 +25,7 @@ def write_batch(project_id, instance_id, table_id):
     table = instance.table(table_id)
 
     with MutationsBatcher(table=table) as batcher:
-        timestamp = datetime.datetime.now(datetime.timezone.utc)
+        timestamp = datetime.now(timezone.utc)
         column_family_id = "stats_summary"
 
         rows = [

samples/snippets/writes/write_conditionally.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # [START bigtable_writes_conditional]
-import datetime
+from datetime import datetime, timezone
 
 from google.cloud import bigtable
 from google.cloud.bigtable import row_filters
@@ -24,7 +24,7 @@ def write_conditional(project_id, instance_id, table_id):
     instance = client.instance(instance_id)
     table = instance.table(table_id)
 
-    timestamp = datetime.datetime.now(datetime.timezone.utc)
+    timestamp = datetime.now(timezone.utc)
     column_family_id = "stats_summary"
 
     row_key = "phone#4c410523#20190501"

samples/snippets/writes/write_simple.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # [START bigtable_writes_simple]
-import datetime
+from datetime import datetime, timezone
 
 from google.cloud import bigtable
 
@@ -24,7 +24,7 @@ def write_simple(project_id, instance_id, table_id):
     instance = client.instance(instance_id)
     table = instance.table(table_id)
 
-    timestamp = datetime.datetime.now(datetime.timezone.utc)
+    timestamp = datetime.now(timezone.utc)
     column_family_id = "stats_summary"
 
     row_key = "phone#4c410523#20190501"

tests/system/v2_client/_helpers.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import datetime
+from datetime import datetime, timezone
 
 import grpc
 from google.api_core import exceptions
@@ -40,7 +40,7 @@ def _retry_on_unavailable(exc):
 
 def label_stamp():
     return (
-        datetime.datetime.now(datetime.timezone.utc)
+        datetime.now(timezone.utc)
         .replace(microsecond=0)
         .strftime("%Y-%m-%dt%H-%M-%S")
     )

tests/system/v2_client/test_data_api.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import datetime
+import datetime, timezone
 import operator
 
 import pytest
@@ -235,7 +235,7 @@ def _write_to_row(row1, row2, row3, row4):
     from google.cloud._helpers import _microseconds_from_datetime
     from google.cloud.bigtable.row_data import Cell
 
-    timestamp1 = datetime.datetime.now(datetime.timezone.utc)
+    timestamp1 = datetime.now(timezone.utc)
     timestamp1_micros = _microseconds_from_datetime(timestamp1)
     # Truncate to millisecond granularity.
     timestamp1_micros -= timestamp1_micros % 1000