[Tables] Fix pylint and sphinx errors (#35081)

Author: Yalin Li

sdk/tables/azure-data-tables/azure/data/tables/_entity.py

@@ -53,8 +53,7 @@ def metadata(self) -> EntityMetadata:
 
 class EdmType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     """
-    Used by :class:`~.EntityProperty` to represent the type of the entity property
-    to be stored by the Table service.
+    Represent the type of the entity property to be stored by the Table service.
     """
 
     BINARY = "Edm.Binary"
@@ -83,18 +82,20 @@ class EdmType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
 
 
 EntityProperty = NamedTuple("EntityProperty", [("value", Any), ("edm_type", Union[str, EdmType])])
-"""
-An entity property. Used to explicitly set :class:`~EdmType` when necessary.
+"""An entity property. Used to explicitly set :class:`~azure.data.Tables.EdmType` when necessary.
 
 Values which require explicit typing are GUID, INT64, and BINARY. Other EdmTypes
 may be explicitly create as EntityProperty objects but need not be. For example,
-the below with both create STRING typed properties on the entity::
+the below with both create STRING typed properties on the entity:
+
+.. code-block:: python
+
     entity = TableEntity()
     entity.a = 'b'
     entity.x = EntityProperty('y', EdmType.STRING)
 
-:param value:
+:param value: The entity property value.
 :type value: Any
-:param edm_type: Type of the value
+:param edm_type: The Edm type of the entity property value.
 :type edm_type: str or ~azure.data.tables.EdmType
 """

sdk/tables/azure-data-tables/azure/data/tables/_models.py

@@ -471,9 +471,11 @@ def service_properties_deserialize(generated: GenTableServiceProperties) -> Dict
         ),
         "hour_metrics": TableMetrics._from_generated(generated.hour_metrics),  # pylint: disable=protected-access
         "minute_metrics": TableMetrics._from_generated(generated.minute_metrics),  # pylint: disable=protected-access
-        "cors": [TableCorsRule._from_generated(cors) for cors in generated.cors]  # pylint: disable=protected-access
-        if generated.cors
-        else generated.cors,
+        "cors": (
+            [TableCorsRule._from_generated(cors) for cors in generated.cors]  # pylint: disable=protected-access
+            if generated.cors
+            else generated.cors
+        ),
     }
 
 

sdk/tables/azure-data-tables/azure/data/tables/_table_batch.py

@@ -123,16 +123,25 @@ def create(self, entity: EntityType, **kwargs) -> None:
         request.url = self._base_url + request.url
         self.requests.append(request)
 
-    def update(self, entity: EntityType, mode: Union[str, UpdateMode] = UpdateMode.MERGE, **kwargs) -> None:
+    def update(
+        self,
+        entity: EntityType,
+        mode: Union[str, UpdateMode] = UpdateMode.MERGE,
+        *,
+        etag: Optional[str] = None,
+        match_condition: Optional[MatchConditions] = None,
+        **kwargs,
+    ) -> None:
         """Adds an update operation to the current batch.
 
         :param entity: The properties for the table entity.
         :type entity: ~azure.data.tables.TableEntity or dict[str, Any]
         :param mode: Merge or Replace entity
         :type mode: ~azure.data.tables.UpdateMode
-        :keyword str etag: Etag of the entity
-        :keyword match_condition: MatchCondition
-        :paramtype match_condition: ~azure.core.MatchCondition
+        :keyword etag: Etag of the entity.
+        :paramtype etag: str or None
+        :keyword match_condition: The match condition to use upon the etag.
+        :paramtype match_condition: ~azure.core.MatchConditions or None
         :return: None
         :raises ValueError:
 
@@ -150,8 +159,6 @@ def update(self, entity: EntityType, mode: Union[str, UpdateMode] = UpdateMode.M
         partition_key = _prepare_key(entity["PartitionKey"])
         row_key = _prepare_key(entity["RowKey"])
 
-        match_condition = kwargs.pop("match_condition", None)
-        etag = kwargs.pop("etag", None)
         if match_condition and not etag and isinstance(entity, TableEntity):
             if hasattr(entity, "metadata"):
                 etag = entity.metadata.get("etag")
@@ -188,14 +195,22 @@ def update(self, entity: EntityType, mode: Union[str, UpdateMode] = UpdateMode.M
         request.url = self._base_url + request.url
         self.requests.append(request)
 
-    def delete(self, entity: EntityType, **kwargs) -> None:
+    def delete(
+        self,
+        entity: EntityType,
+        *,
+        etag: Optional[str] = None,
+        match_condition: Optional[MatchConditions] = None,
+        **kwargs,
+    ) -> None:
         """Adds a delete operation to the current branch.
 
-        param entity: The properties for the table entity.
+        :param entity: The properties for the table entity.
         :type entity: ~azure.data.tables.TableEntity or dict[str, Any]
-        :keyword str etag: Etag of the entity
-        :keyword match_condition: MatchCondition
-        :paramtype match_condition: ~azure.core.MatchCondition
+        :keyword etag: Etag of the entity.
+        :paramtype etag: str or None
+        :keyword match_condition: The match condition to use upon the etag.
+        :paramtype match_condition: ~azure.core.MatchConditions or None
         :return: None
         :raises: ValueError
 
@@ -209,27 +224,24 @@ def delete(self, entity: EntityType, **kwargs) -> None:
                 :caption: Creating and adding an entity to a Table
         """
         self._verify_partition_key(entity)
-        match_condition = kwargs.pop("match_condition", None)
-        etag = kwargs.pop("etag", None)
         if match_condition and not etag and isinstance(entity, TableEntity):
             etag = entity.metadata.get("etag")
-        match_condition = _get_match_condition(
-            etag=etag, match_condition=match_condition or MatchConditions.Unconditionally
-        )
         request = build_table_delete_entity_request(
             table=self.table_name,
             partition_key=_prepare_key(entity["PartitionKey"]),
             row_key=_prepare_key(entity["RowKey"]),
-            etag=etag,
-            match_condition=match_condition,
+            etag=etag,  # type: ignore[arg-type] # Set None to skip checking etag.
+            match_condition=_get_match_condition(
+                etag=etag, match_condition=match_condition or MatchConditions.Unconditionally
+            ),
             version=self._config.version,
             **kwargs,
         )
         request.url = self._base_url + request.url
         self.requests.append(request)
 
     def upsert(self, entity: EntityType, mode: Union[str, UpdateMode] = UpdateMode.MERGE, **kwargs) -> None:
-        """Adds an upsert (update/merge) operation to the batch.
+        """Adds an upsert (merge or replace) operation to the batch.
 
         :param entity: The properties for the table entity.
         :type entity: ~azure.data.tables.TableEntity or dict[str, Any]