Move Storage Queue to new Paging

sdk/storage/azure-storage-blob/azure/storage/blob/blob_service_client.py

@@ -14,6 +14,8 @@
 except ImportError:
     from urlparse import urlparse # type: ignore
 
+from azure.core.paging import ItemPaged
+
 from ._shared.shared_access_signature import SharedAccessSignature
 from ._shared.models import LocationMode, Services
 from ._shared.utils import (
@@ -380,12 +382,11 @@ def set_service_properties(
     def list_containers(
             self, name_starts_with=None,  # type: Optional[str]
             include_metadata=False,  # type: Optional[bool]
-            marker=None,  # type: Optional[str]
             results_per_page=None,  # type: Optional[int]
             timeout=None,  # type: Optional[int]
             **kwargs
         ):
-        # type: (...) -> ContainerPropertiesPaged
+        # type: (...) -> Iterable[ContainerProperties]
         """Returns a generator to list the containers under the specified account.
 
         The generator will lazily follow the continuation tokens returned by
@@ -397,17 +398,13 @@ def list_containers(
         :param bool include_metadata:
             Specifies that container metadata be returned in the response.
             The default value is `False`.
-        :param str marker:
-            An opaque continuation token. This value can be retrieved from the
-            next_marker field of a previous generator object. If specified,
-            this generator will begin returning results from this point.
         :param int results_per_page:
             The maximum number of container names to retrieve per API
             call. If the request does not specify the server will return up to 5,000 items.
         :param int timeout:
             The timeout parameter is expressed in seconds.
         :returns: An iterable (auto-paging) of ContainerProperties.
-        :rtype: ~azure.core.blob.models.ContainerPropertiesPaged
+        :rtype: ~azure.core.paging.ItemPaged[~azure.core.blob.models.ContainerProperties]
 
         Example:
             .. literalinclude:: ../tests/test_blob_samples_service.py
@@ -424,8 +421,8 @@ def list_containers(
             include=include,
             timeout=timeout,
             **kwargs)
-        return ContainerPropertiesPaged(
-            command, prefix=name_starts_with, results_per_page=results_per_page, marker=marker)
+        return ItemPaged(
+            command, prefix=name_starts_with, results_per_page=results_per_page, page_iterator_class=ContainerPropertiesPaged)
 
     def create_container(
             self, name,  # type: str

sdk/storage/azure-storage-blob/azure/storage/blob/container_client.py

@@ -16,6 +16,8 @@
     from urlparse import urlparse # type: ignore
     from urllib2 import quote, unquote # type: ignore
 
+from azure.core.paging import ItemPaged
+
 import six
 
 from ._shared.shared_access_signature import BlobSharedAccessSignature
@@ -658,8 +660,8 @@ def set_container_access_policy(
         except StorageErrorException as error:
             process_storage_error(error)
 
-    def list_blobs(self, name_starts_with=None, include=None, marker=None, timeout=None, **kwargs):
-        # type: (Optional[str], Optional[Any], Optional[str], Optional[int], **Any) -> Iterable[BlobProperties]
+    def list_blobs(self, name_starts_with=None, include=None, timeout=None, **kwargs):
+        # type: (Optional[str], Optional[Any], Optional[int], **Any) -> Iterable[BlobProperties]
         """Returns a generator to list the blobs under the specified container.
         The generator will lazily follow the continuation tokens returned by
         the service.
@@ -670,14 +672,10 @@ def list_blobs(self, name_starts_with=None, include=None, marker=None, timeout=N
         :param list[str] include:
             Specifies one or more additional datasets to include in the response.
             Options include: 'snapshots', 'metadata', 'uncommittedblobs', 'copy', 'deleted'.
-        :param str marker:
-            An opaque continuation token. This value can be retrieved from the
-            next_marker field of a previous generator object. If specified,
-            this generator will begin returning results from this point.
         :param int timeout:
             The timeout parameter is expressed in seconds.
         :returns: An iterable (auto-paging) response of BlobProperties.
-        :rtype: ~azure.storage.blob.models.BlobPropertiesPaged
+        :rtype: ~azure.core.paging.ItemPaged[~azure.storage.blob.models.BlobProperties]
 
         Example:
             .. literalinclude:: ../tests/test_blob_samples_containers.py
@@ -696,13 +694,15 @@ def list_blobs(self, name_starts_with=None, include=None, marker=None, timeout=N
             include=include,
             timeout=timeout,
             **kwargs)
-        return BlobPropertiesPaged(command, prefix=name_starts_with, results_per_page=results_per_page, marker=marker)
+        return ItemPaged(
+            command, prefix=name_starts_with, results_per_page=results_per_page,
+            page_iterator_class=BlobPropertiesPaged)
+
 
     def walk_blobs(
             self, name_starts_with=None, # type: Optional[str]
             include=None, # type: Optional[Any]
             delimiter="/", # type: str
-            marker=None, # type: Optional[str]
             timeout=None, # type: Optional[int]
             **kwargs # type: Optional[Any]
         ):
@@ -723,20 +723,15 @@ def walk_blobs(
             element in the response body that acts as a placeholder for all blobs whose
             names begin with the same substring up to the appearance of the delimiter
             character. The delimiter may be a single character or a string.
-        :param str marker:
-            An opaque continuation token. This value can be retrieved from the
-            next_marker field of a previous generator object. If specified,
-            this generator will begin returning results from this point.
         :param int timeout:
             The timeout parameter is expressed in seconds.
         :returns: An iterable (auto-paging) response of BlobProperties.
-        :rtype: ~azure.storage.blob.models.BlobPrefix
+        :rtype: ~azure.core.paging.ItemPaged[~azure.storage.blob.models.BlobProperties]
         """
         if include and not isinstance(include, list):
             include = [include]
 
         results_per_page = kwargs.pop('results_per_page', None)
-        marker = kwargs.pop('marker', "")
         command = functools.partial(
             self._client.container.list_blob_hierarchy_segment,
             delimiter=delimiter,
@@ -747,7 +742,6 @@ def walk_blobs(
             command,
             prefix=name_starts_with,
             results_per_page=results_per_page,
-            marker=marker,
             delimiter=delimiter)
 
     def upload_blob(