Replace types string with str.

tswast · tswast · commit b212e2fc7142 · 2016-10-20T15:50:55.000-07:00
Uses command: ag -l 'type ([^:]+): string' | \ xargs gsed -r -i.bak -e 's/type ([^:]+): string/type \1: str/g' Note: [-r for gsed (GNU sed) is needed for group matching](http://superuser.com/a/336819/125262).
diff --git a/packages/google-cloud-storage/google/cloud/storage/_helpers.py b/packages/google-cloud-storage/google/cloud/storage/_helpers.py
@@ -28,7 +28,7 @@ class _PropertyMixin(object):
       - client
       - path
 
-    :type name: string
+    :type name: str
     :param name: The name of the object.
     """
 
@@ -88,7 +88,7 @@ def _patch_property(self, name, value):
         It **will not** reload the properties from the server. The behavior is
         local only and syncing occurs via :meth:`patch`.
 
-        :type name: string
+        :type name: str
         :param name: The field name to update.
 
         :type value: object
diff --git a/packages/google-cloud-storage/google/cloud/storage/acl.py b/packages/google-cloud-storage/google/cloud/storage/acl.py
@@ -85,10 +85,10 @@ class _ACLEntity(object):
     This is a helper class that you likely won't ever construct
     outside of using the factor methods on the :class:`ACL` object.
 
-    :type entity_type: string
+    :type entity_type: str
     :param entity_type: The type of entity (ie, 'group' or 'user').
 
-    :type identifier: string
+    :type identifier: str
     :param identifier: The ID or e-mail of the entity. For the special
                        entity types (like 'allUsers') this is optional.
     """
@@ -123,15 +123,15 @@ def get_roles(self):
     def grant(self, role):
         """Add a role to the entity.
 
-        :type role: string
+        :type role: str
         :param role: The role to add to the entity.
         """
         self.roles.add(role)
 
     def revoke(self, role):
         """Remove a role from the entity.
 
-        :type role: string
+        :type role: str
         :param role: The role to remove from the entity.
         """
         if role in self.roles:
@@ -298,11 +298,11 @@ def entity(self, entity_type, identifier=None):
         create a new one and add it to the list of known entities for
         this ACL.
 
-        :type entity_type: string
+        :type entity_type: str
         :param entity_type: The type of entity to create
                             (ie, ``user``, ``group``, etc)
 
-        :type identifier: string
+        :type identifier: str
         :param identifier: The ID of the entity (if applicable).
                            This can be either an ID or an e-mail address.
 
@@ -319,7 +319,7 @@ def entity(self, entity_type, identifier=None):
     def user(self, identifier):
         """Factory method for a user Entity.
 
-        :type identifier: string
+        :type identifier: str
         :param identifier: An id or e-mail for this particular user.
 
         :rtype: :class:`_ACLEntity`
@@ -330,7 +330,7 @@ def user(self, identifier):
     def group(self, identifier):
         """Factory method for a group Entity.
 
-        :type identifier: string
+        :type identifier: str
         :param identifier: An id or e-mail for this particular group.
 
         :rtype: :class:`_ACLEntity`
@@ -341,7 +341,7 @@ def group(self, identifier):
     def domain(self, domain):
         """Factory method for a domain Entity.
 
-        :type domain: string
+        :type domain: str
         :param domain: The domain for this entity.
 
         :rtype: :class:`_ACLEntity`
@@ -419,7 +419,7 @@ def _save(self, acl, predefined, client):
         :param acl: The ACL object to save.  If left blank, this will save
                     current entries.
 
-        :type predefined: string or None
+        :type predefined: str or None
         :param predefined: An identifier for a predefined ACL.  Must be one
                            of the keys in :attr:`PREDEFINED_JSON_ACLS`
                            If passed, `acl` must be None.
@@ -470,7 +470,7 @@ def save(self, acl=None, client=None):
     def save_predefined(self, predefined, client=None):
         """Save this ACL for the current bucket using a predefined ACL.
 
-        :type predefined: string
+        :type predefined: str
         :param predefined: An identifier for a predefined ACL.  Must be one
                            of the keys in :attr:`PREDEFINED_JSON_ACLS`
                            or :attr:`PREDEFINED_XML_ACLS` (which will be
diff --git a/packages/google-cloud-storage/google/cloud/storage/blob.py b/packages/google-cloud-storage/google/cloud/storage/blob.py
@@ -50,7 +50,7 @@
 class Blob(_PropertyMixin):
     """A wrapper around Cloud Storage's concept of an ``Object``.
 
-    :type name: string
+    :type name: str
     :param name: The name of the blob.  This corresponds to the
                  unique path of the object in the bucket.
 
@@ -109,10 +109,10 @@ def chunk_size(self, value):
     def path_helper(bucket_path, blob_name):
         """Relative URL path for a blob.
 
-        :type bucket_path: string
+        :type bucket_path: str
         :param bucket_path: The URL path for a bucket.
 
-        :type blob_name: string
+        :type blob_name: str
         :param blob_name: The name of the blob.
 
         :rtype: str
@@ -355,7 +355,7 @@ def download_to_file(self, file_obj, client=None):
     def download_to_filename(self, filename, client=None):
         """Download the contents of this blob into a named file.
 
-        :type filename: string
+        :type filename: str
         :param filename: A filename to be passed to ``open``.
 
         :type client: :class:`~google.cloud.storage.client.Client` or
@@ -450,7 +450,7 @@ def upload_from_file(self, file_obj, rewind=False, size=None,
                      :func:`os.fstat`. (If the file handle is not from the
                      filesystem this won't be possible.)
 
-        :type content_type: string or ``NoneType``
+        :type content_type: str or ``NoneType``
         :param content_type: Optional type of content being uploaded.
 
         :type num_retries: integer
@@ -564,10 +564,10 @@ def upload_from_filename(self, filename, content_type=None, client=None):
            `lifecycle <https://cloud.google.com/storage/docs/lifecycle>`_
            API documents for details.
 
-        :type filename: string
+        :type filename: str
         :param filename: The path to the file.
 
-        :type content_type: string or ``NoneType``
+        :type content_type: str or ``NoneType``
         :param content_type: Optional type of content being uploaded.
 
         :type client: :class:`~google.cloud.storage.client.Client` or
@@ -601,7 +601,7 @@ def upload_from_string(self, data, content_type='text/plain', client=None):
         :param data: The data to store in this blob.  If the value is
                      text, it will be encoded as UTF-8.
 
-        :type content_type: string
+        :type content_type: str
         :param content_type: Optional type of content being uploaded. Defaults
                              to ``'text/plain'``.
 
diff --git a/packages/google-cloud-storage/google/cloud/storage/bucket.py b/packages/google-cloud-storage/google/cloud/storage/bucket.py
@@ -74,7 +74,7 @@ class Bucket(_PropertyMixin):
     :param client: A client which holds credentials and project configuration
                    for the bucket (which requires a project).
 
-    :type name: string
+    :type name: str
     :param name: The name of the bucket.
     """
 
@@ -108,7 +108,7 @@ def blob(self, blob_name, chunk_size=None, encryption_key=None):
           This will not make an HTTP request; it simply instantiates
           a blob object owned by this bucket.
 
-        :type blob_name: string
+        :type blob_name: str
         :param blob_name: The name of the blob to be instantiated.
 
         :type chunk_size: integer
@@ -190,7 +190,7 @@ def default_object_acl(self):
     def path_helper(bucket_name):
         """Relative URL path for a bucket.
 
-        :type bucket_name: string
+        :type bucket_name: str
         :param bucket_name: The bucket name in the path.
 
         :rtype: str
@@ -219,7 +219,7 @@ def get_blob(self, blob_name, client=None):
           >>> print(bucket.get_blob('/does-not-exist.txt'))
           None
 
-        :type blob_name: string
+        :type blob_name: str
         :param blob_name: The name of the blob to retrieve.
 
         :type client: :class:`~google.cloud.storage.client.Client` or
@@ -386,7 +386,7 @@ def delete_blob(self, blob_name, client=None):
           ... except NotFound:
           ...   pass
 
-        :type blob_name: string
+        :type blob_name: str
         :param blob_name: A blob name to delete.
 
         :type client: :class:`~google.cloud.storage.client.Client` or
@@ -452,7 +452,7 @@ def copy_blob(self, blob, destination_bucket, new_name=None,
         :param destination_bucket: The bucket into which the blob should be
                                    copied.
 
-        :type new_name: string
+        :type new_name: str
         :param new_name: (optional) the new name for the copied file.
 
         :type client: :class:`~google.cloud.storage.client.Client` or
@@ -494,7 +494,7 @@ def rename_blob(self, blob, new_name, client=None):
         :type blob: :class:`google.cloud.storage.blob.Blob`
         :param blob: The blob to be renamed.
 
-        :type new_name: string
+        :type new_name: str
         :param new_name: The new name for this blob.
 
         :type client: :class:`~google.cloud.storage.client.Client` or
@@ -604,10 +604,10 @@ def enable_logging(self, bucket_name, object_prefix=''):
 
         See: https://cloud.google.com/storage/docs/accesslogs#delivery
 
-        :type bucket_name: string
+        :type bucket_name: str
         :param bucket_name: name of bucket in which to store access logs
 
-        :type object_prefix: string
+        :type object_prefix: str
         :param object_prefix: prefix for access log filenames
         """
         info = {'logBucket': bucket_name, 'logObjectPrefix': object_prefix}
@@ -691,7 +691,7 @@ def storage_class(self, value):
 
         See: https://cloud.google.com/storage/docs/storage-classes
 
-        :type value: string
+        :type value: str
         :param value: one of "MULTI_REGIONAL", "REGIONAL", "NEARLINE",
                       "COLDLINE", "STANDARD", or "DURABLE_REDUCED_AVAILABILITY"
         """
@@ -764,12 +764,12 @@ def configure_website(self, main_page_suffix=None, not_found_page=None):
         the bucket, and anything else I add to the bucket.  Just make it
         all public."
 
-        :type main_page_suffix: string
+        :type main_page_suffix: str
         :param main_page_suffix: The page to use as the main page
                                  of a directory.
                                  Typically something like index.html.
 
-        :type not_found_page: string
+        :type not_found_page: str
         :param not_found_page: The file to use when a page isn't found.
         """
         data = {
diff --git a/packages/google-cloud-storage/google/cloud/storage/client.py b/packages/google-cloud-storage/google/cloud/storage/client.py
@@ -27,7 +27,7 @@
 class Client(JSONClient):
     """Client to bundle configuration needed for API requests.
 
-    :type project: string
+    :type project: str
     :param project: the project which the client acts on behalf of. Will be
                     passed when creating a topic.  If not passed,
                     falls back to the default inferred from the environment.
@@ -121,7 +121,7 @@ def bucket(self, bucket_name):
           This will not make an HTTP request; it simply instantiates
           a bucket object owned by this client.
 
-        :type bucket_name: string
+        :type bucket_name: str
         :param bucket_name: The name of the bucket to be instantiated.
 
         :rtype: :class:`google.cloud.storage.bucket.Bucket`
@@ -156,7 +156,7 @@ def get_bucket(self, bucket_name):
 
         This implements "storage.buckets.get".
 
-        :type bucket_name: string
+        :type bucket_name: str
         :param bucket_name: The name of the bucket to get.
 
         :rtype: :class:`google.cloud.storage.bucket.Bucket`
@@ -180,7 +180,7 @@ def lookup_bucket(self, bucket_name):
           >>> print(bucket)
           <Bucket: my-bucket>
 
-        :type bucket_name: string
+        :type bucket_name: str
         :param bucket_name: The name of the bucket to get.
 
         :rtype: :class:`google.cloud.storage.bucket.Bucket`
@@ -205,7 +205,7 @@ def create_bucket(self, bucket_name):
         If the bucket already exists, will raise
         :class:`google.cloud.exceptions.Conflict`.
 
-        :type bucket_name: string
+        :type bucket_name: str
         :param bucket_name: The bucket name to create.
 
         :rtype: :class:`google.cloud.storage.bucket.Bucket`
@@ -230,20 +230,20 @@ def list_buckets(self, max_results=None, page_token=None, prefix=None,
         :type max_results: integer or ``NoneType``
         :param max_results: Optional. Maximum number of buckets to return.
 
-        :type page_token: string or ``NoneType``
+        :type page_token: str or ``NoneType``
         :param page_token: Optional. Opaque marker for the next "page" of
                            buckets. If not passed, will return the first page
                            of buckets.
 
-        :type prefix: string or ``NoneType``
+        :type prefix: str or ``NoneType``
         :param prefix: Optional. Filter results to buckets whose names begin
                        with this prefix.
 
-        :type projection: string or ``NoneType``
+        :type projection: str or ``NoneType``
         :param projection: If used, must be 'full' or 'noAcl'. Defaults to
                            'noAcl'. Specifies the set of properties to return.
 
-        :type fields: string or ``NoneType``
+        :type fields: str or ``NoneType``
         :param fields: Selector specifying which fields to include in a
                        partial response. Must be a list of fields. For example
                        to get a partial response with just the next page token
