fixed path of files

Author: LibbaLawrence

sdk/Table/__init__.py

@@ -0,0 +1,5 @@
+__all__ = [
+    'generate_account_sas',
+]
+
+from azure.table import generate_account_sas

sdk/Table/azure/azure_table/__init__.py

@@ -6,7 +6,6 @@
 
 import logging
 import sys
-from os import name
 
 try:
     from urllib.parse import urlparse, unquote, parse_qsl
@@ -31,7 +30,7 @@
     _sign_string,
 )
 
-from azure.storage.tables._shared._constants import (
+from azure.table import (
     DEV_ACCOUNT_NAME,
     DEV_ACCOUNT_SECONDARY_NAME
 )

sdk/Table/azure/storage/tables/_deserialize.py renamed to sdk/Table/azure/azure_table/_deserialize.py

@@ -1,9 +1,9 @@
 from urllib.parse import urlparse
 
-from azure.storage.tables._generated import AzureTable
-from azure.storage.tables._generated.models import TableProperties
-from azure.storage.tables._shared.base_client import StorageAccountHostsMixin, parse_connection_str, parse_query
-from azure.storage.tables._version import VERSION
+from azure.table import AzureTable
+from azure.table import TableProperties
+from azure.table import StorageAccountHostsMixin, parse_connection_str, parse_query
+from azure.table import VERSION
 
 
 class TableServiceClient(StorageAccountHostsMixin):
@@ -42,7 +42,7 @@ def from_connection_string(
             credential=None,  # type: Optional[Any]
             **kwargs  # type: Any
     ):  # type: (...) -> TableServiceClient
-        """Create QueueServiceClient from a Connection String.
+        """Create TableServiceClient from a Connection String.
 
         :param str conn_str:
             A connection string to an Azure Storage account.
@@ -51,8 +51,8 @@ def from_connection_string(
             account URL already has a SAS token, or the connection string already has shared
             access key values. The value can be a SAS token string, an account shared access
             key, or an instance of a TokenCredentials class from azure.identity.
-        :returns: A Queue service client.
-        :rtype: ~azure.storage.queue.QueueClient
+        :returns: A Table service client.
+        :rtype: ~azure.storage.table.TableClient
 
         .. admonition:: Example:
 
@@ -79,6 +79,34 @@ def delete_table(self, table_name):
         return response
 
     def query_table(self, table_name):
-        response = self._client.table.query_entities(table_name=table_name)
+        # somehow use self._query_string to query things
+        response = self._client.table.query(table_name=table_name)
         return response
 
+    def query_table_entities(self, table_name):
+        response = self._client.table.query_entities(table_name=table_name)
+
+    def query_table_entities_with_partition_and_row_key(self, table_name):
+        response = self._client.table.query_entities_with_partition_and_row_key(table_name=table_name)
+
+    def insert_entity(self):
+        response = self._client.table.insert_entity()
+
+    def delete_entity(self):
+        response = self._client.table.delete_entity()
+
+    def merge_entity(self):
+        response = self._client.table.merge_entity()
+
+    def update_entity(self):
+        response = self._client.table.update_entity()
+
+    def get_access_policy(self):
+        response = self._client.table.get_access_policy()
+
+    def set_access_policy(self):
+        response = self._client.table.set_access_policy()
+
+    def batch(self, *reqs):
+        response = self.batch(*reqs)
+        return response

sdk/Table/azure/storage/tables/_generated/__init__.py renamed to sdk/Table/azure/azure_table/_generated/__init__.py

@@ -1,3 +1,5 @@
 class CreateBatch(object):
     def build_batch_operations(self):
         from azure.storage.tables import TableServiceClient
+        table_client = TableServiceClient(account_url=self.account_url,credential=self.credential)
+        batch_operations = table_client.batch(*self.reqs)

sdk/Table/azure/storage/tables/_generated/_azure_table.py renamed to sdk/Table/azure/azure_table/_generated/_azure_table.py

@@ -5,16 +5,14 @@
 # license information.
 # --------------------------------------------------------------------------
 from __future__ import division
-from contextlib import contextmanager
-import copy
-import inspect
 import os
 import os.path
 import time
 from datetime import datetime, timedelta
 
-from azure.storage.tables import generate_account_sas
-from azure.storage.tables._shared.models import ResourceTypes, AccountSasPermissions
+from azure.azure_table import generate_account_sas
+from azure.azure_table._shared.models import ResourceTypes, AccountSasPermissions
+
 from pyparsing import basestring
 
 try:
@@ -23,9 +21,7 @@
     import mock
 
 import zlib
-import math
 import sys
-import string
 import random
 import re
 import logging
@@ -36,7 +32,8 @@
     StorageAccountPreparer,
     FakeResource,
 )
-from azure_devtools.scenario_tests import RecordingProcessor, AzureTestError, create_random_name
+from azure_devtools.scenario_tests import RecordingProcessor, AzureTestError
+
 try:
     from cStringIO import StringIO      # Python 2
 except ImportError:

sdk/Table/azure/storage/tables/_generated/_configuration.py renamed to sdk/Table/azure/azure_table/_generated/_configuration.py

@@ -15,11 +15,11 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Thu, 28 May 2020 14:13:36 GMT
+      - Fri, 29 May 2020 14:04:04 GMT
       User-Agent:
-      - azsdk-python-storage-table/2019-07-07 Python/3.8.3 (Windows-10-10.0.18362-SP0)
+      - azsdk-python-storage-table/2019-07-07 Python/3.8.3 (Windows-10-10.0.19041-SP0)
       x-ms-date:
-      - Thu, 28 May 2020 14:13:36 GMT
+      - Fri, 29 May 2020 14:04:04 GMT
       x-ms-version:
       - '2019-07-07'
     method: POST
@@ -33,7 +33,7 @@ interactions:
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Thu, 28 May 2020 14:13:35 GMT
+      - Fri, 29 May 2020 14:04:02 GMT
       location:
       - https://storagename.table.core.windows.net/Tables('myTable')
       server:

sdk/Table/azure/storage/tables/_generated/aio/__init__.py renamed to sdk/Table/azure/azure_table/_generated/aio/__init__.py

@@ -5,41 +5,31 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-import base64
-import hashlib
-import hmac
-from collections import namedtuple
-import unittest
 import pytest
 import sys
 import locale
 import os
-from azure.storage.tables import TableServiceClient
+from azure.azure_table import TableServiceClient
 from time import time
 from wsgiref.handlers import format_date_time
-from dateutil.tz import tzutc
 from datetime import (
     datetime,
     timedelta,
-    date,
 )
-from devtools_testutils import ResourceGroupPreparer, StorageAccountPreparer
-from azure.mgmt.storage.models import Endpoints
 from azure.core.pipeline import Pipeline
 from azure.core.pipeline.policies import (
     HeadersPolicy,
     ContentDecodePolicy,
 )
 
-from _shared.testcase import GlobalStorageAccountPreparer, TableTestCase, LogCaptured
 
-from azure.storage.tables._shared.authentication import SharedKeyCredentialPolicy
+from _shared.testcase import TableTestCase, GlobalStorageAccountPreparer
+from azure.azure_table._shared.authentication import SharedKeyCredentialPolicy
 from azure.core.pipeline.transport import RequestsTransport
 from azure.core.exceptions import (
     HttpResponseError,
     ResourceNotFoundError,
-    ResourceExistsError,
-    ClientAuthenticationError)
+    ResourceExistsError)
 
 # from azure.tables import (
 #     TableServiceClient,
@@ -52,14 +42,8 @@
 #     generate_table_sas
 # )
 
-from azure.storage.tables._generated import (
-    AzureTable,
-)
-
-from azure.storage.tables._generated.models._models_py3 import TableProperties
-
 # ------------------------------------------------------------------------------
-from webencodings import Encoding
+
 
 TEST_TABLE_PREFIX = 'pytablesync'