From f18ca62c184eacdbb58867d46abb0032fccb88b4 Mon Sep 17 00:00:00 2001 From: seankane-msft Date: Wed, 12 Aug 2020 10:04:44 -0700 Subject: [PATCH] changing Table to TableItem, will add metadata stuff before PR --- .../azure-data-tables/azure/data/tables/__init__.py | 4 ++-- .../azure-data-tables/azure/data/tables/_models.py | 6 +++--- .../azure/data/tables/_table_client.py | 10 +++++----- .../azure/data/tables/_table_service_client.py | 10 +++++----- .../azure-data-tables/azure/data/tables/aio/_models.py | 4 ++-- .../azure/data/tables/aio/_table_client_async.py | 8 ++++---- .../data/tables/aio/_table_service_client_async.py | 10 +++++----- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sdk/tables/azure-data-tables/azure/data/tables/__init__.py b/sdk/tables/azure-data-tables/azure/data/tables/__init__.py index 5424c62cb7ca..4a424ceaf552 100644 --- a/sdk/tables/azure-data-tables/azure/data/tables/__init__.py +++ b/sdk/tables/azure-data-tables/azure/data/tables/__init__.py @@ -19,7 +19,7 @@ CorsRule, UpdateMode, SASProtocol, - Table, + TableItem, LocationMode, ResourceTypes, AccountSasPermissions, @@ -47,7 +47,7 @@ 'generate_account_sas', 'CorsRule', 'UpdateMode', - 'Table', + 'TableItem', 'TableEntity', 'EntityProperty', 'EdmType', diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_models.py b/sdk/tables/azure-data-tables/azure/data/tables/_models.py index 5dbb662aff4e..c6690819aac7 100644 --- a/sdk/tables/azure-data-tables/azure/data/tables/_models.py +++ b/sdk/tables/azure-data-tables/azure/data/tables/_models.py @@ -299,7 +299,7 @@ def _get_next_cb(self, continuation_token, **kwargs): def _extract_data_cb(self, get_next_return): self.location_mode, self._response, self._headers = get_next_return props_list = [] - props_list = [Table(t) for t in self._response.value] + props_list = [TableItem(t) for t in self._response.value] return self._headers['x-ms-continuation-NextTableName'] or None, props_list @@ -458,9 +458,9 @@ def service_properties_deserialize(generated): } -class Table(object): +class TableItem(object): """ - Represents an Azure Table. Returned by list_tables. + Represents an Azure TableItem. Returned by list_tables and query_tables. :ivar str name: The name of the table. """ diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py b/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py index a8ee3a33c212..5574fe36e930 100644 --- a/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py +++ b/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py @@ -28,7 +28,7 @@ from ._deserialize import _return_headers_and_deserialized from ._error import _process_table_error from ._version import VERSION -from ._models import TableEntityPropertiesPaged, UpdateMode, Table +from ._models import TableEntityPropertiesPaged, UpdateMode, TableItem class TableClient(TableClientBase): @@ -182,17 +182,17 @@ def create_table( self, **kwargs # type: Any ): - # type: (...) -> Table + # type: (...) -> TableItem """Creates a new table under the current account. - :return: Table created - :rtype: Table + :return: TableItem created + :rtype: TableItem :raises: ~azure.core.exceptions.HttpResponseError """ table_properties = TableProperties(table_name=self.table_name, **kwargs) try: table = self._client.table.create(table_properties) - return Table(table=table) + return TableItem(table=table) except HttpResponseError as error: _process_table_error(error) diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py b/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py index 1c4c94303ef6..db82a4443d1b 100644 --- a/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py +++ b/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py @@ -10,7 +10,7 @@ from azure.core.paging import ItemPaged from azure.core.tracing.decorator import distributed_trace from azure.core.pipeline import Pipeline -from ._models import Table +from ._models import TableItem from ._generated import AzureTable from ._generated.models import TableProperties, TableServiceProperties, QueryOptions @@ -181,7 +181,7 @@ def query_tables( filter, # pylint: disable=W0622 **kwargs # type: Any ): - # type: (...) -> ItemPaged[Table] + # type: (...) -> ItemPaged[TableItem] """Queries tables under the given account. :param filter: Specify a filter to return certain tables :type filter: str @@ -189,7 +189,7 @@ def query_tables( :keyword Union[str, list(str)] select: Specify desired properties of a table to return certain tables :keyword dict parameters: Dictionary for formatting query with additional, user defined parameters :return: A query of tables - :rtype: ItemPaged[Table] + :rtype: ItemPaged[TableItem] :raises: ~azure.core.exceptions.HttpResponseError """ parameters = kwargs.pop('parameters', None) @@ -213,13 +213,13 @@ def list_tables( self, **kwargs # type: Any ): - # type: (...) -> ItemPaged[Table] + # type: (...) -> ItemPaged[TableItem] """Queries tables under the given account. :keyword int results_per_page: Number of tables per page in return ItemPaged :keyword Union[str, list(str)] select: Specify desired properties of a table to return certain tables :return: A query of tables - :rtype: ItemPaged[Table] + :rtype: ItemPaged[TableItem] :raises: ~azure.core.exceptions.HttpResponseError """ user_select = kwargs.pop('select', None) diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_models.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_models.py index fa19a7a1a4fd..440baecc21f4 100644 --- a/sdk/tables/azure-data-tables/azure/data/tables/aio/_models.py +++ b/sdk/tables/azure-data-tables/azure/data/tables/aio/_models.py @@ -10,7 +10,7 @@ _return_context_and_deserialized, _convert_to_entity ) -from .._models import Table +from .._models import TableItem from .._error import _process_table_error class TablePropertiesPaged(AsyncPageIterator): @@ -47,7 +47,7 @@ async def _get_next_cb(self, continuation_token, **kwargs): async def _extract_data_cb(self, get_next_return): self.location_mode, self._response, self._headers = get_next_return - props_list = [Table(t) for t in self._response.value] + props_list = [TableItem(t) for t in self._response.value] return self._headers['x-ms-continuation-NextTableName'] or None, props_list diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py index 5adb7e22b7b6..a338bde69783 100644 --- a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py +++ b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py @@ -18,7 +18,7 @@ from .._entity import TableEntity from .._generated.aio import AzureTable from .._generated.models import SignedIdentifier, TableProperties, QueryOptions -from .._models import AccessPolicy, Table +from .._models import AccessPolicy, TableItem from .._serialize import serialize_iso from .._deserialize import _return_headers_and_deserialized from .._error import _process_table_error @@ -126,16 +126,16 @@ async def create_table( self, **kwargs # type: Any ): - # type: (...) -> Table + # type: (...) -> TableItem """Creates a new table under the given account. :return: Table created - :rtype: Table + :rtype: TableItem :raises: ~azure.core.exceptions.HttpResponseError """ table_properties = TableProperties(table_name=self.table_name, **kwargs) try: table = await self._client.table.create(table_properties) - return Table(table) + return TableItem(table) except HttpResponseError as error: _process_table_error(error) diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py index 1901b0f1903a..c7b3f6873d3c 100644 --- a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py +++ b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py @@ -22,7 +22,7 @@ from .._models import service_stats_deserialize, service_properties_deserialize from .._error import _validate_table_name, _process_table_error from .._table_service_client_base import TableServiceClientBase -from .._models import Table +from .._models import TableItem from ._policies_async import ExponentialRetry from ._table_client_async import TableClient from ._base_client_async import AsyncStorageAccountHostsMixin, AsyncTransportWrapper @@ -205,13 +205,13 @@ def list_tables( self, **kwargs # type: Any ): - # type: (...) -> AsyncItemPaged[Table] + # type: (...) -> AsyncItemPaged[TableItem] """Queries tables under the given account. :keyword int results_per_page: Number of tables per page in return ItemPaged :keyword Union[str, list(str)] select: Specify desired properties of a table to return certain tables :return: AsyncItemPaged - :rtype: ~AsyncItemPaged[Table] + :rtype: ~AsyncItemPaged[TableItem] :raises: ~azure.core.exceptions.HttpResponseError """ user_select = kwargs.pop('select', None) @@ -235,7 +235,7 @@ def query_tables( filter, # pylint: disable=W0622 **kwargs # type: Any ): - # type: (...) -> AsyncItemPaged[Table] + # type: (...) -> AsyncItemPaged[TableItem] """Queries tables under the given account. :param filter: Specify a filter to return certain tables :type filter: str @@ -243,7 +243,7 @@ def query_tables( :keyword Union[str, list(str)] select: Specify desired properties of a table to return certain tables :keyword dict parameters: Dictionary for formatting query with additional, user defined parameters :return: A query of tables - :rtype: AsyncItemPaged[Table] + :rtype: AsyncItemPaged[TableItem] :raises: ~azure.core.exceptions.HttpResponseError """ parameters = kwargs.pop('parameters', None)