Merge pull request #2579 from tswast/str-not-string

Replace types string with str.

Author: dhermes

packages/google-cloud-core/google/cloud/_helpers.py

@@ -438,7 +438,7 @@ def _datetime_to_rfc3339(value, ignore_zone=True):
     :type value: :class:`datetime.datetime`
     :param value: The datetime object to be converted to a string.
 
-    :type ignore_zone: boolean
+    :type ignore_zone: bool
     :param ignore_zone: If True, then the timezone (if any) of the datetime
                         object is ignored.
 
@@ -526,7 +526,7 @@ def _pb_timestamp_to_rfc3339(timestamp_pb):
     :type timestamp_pb: :class:`google.protobuf.timestamp_pb2.Timestamp`
     :param timestamp_pb: A Google returned timestamp protobuf.
 
-    :rtype: string
+    :rtype: str
     :returns: An RFC 3339 formatted timestamp string.
     """
     timestamp = _pb_timestamp_to_datetime(timestamp_pb)

packages/google-cloud-core/google/cloud/client.py

@@ -34,7 +34,7 @@ class _ClientFactoryMixin(object):
     def from_service_account_json(cls, json_credentials_path, *args, **kwargs):
         """Factory to retrieve JSON credentials while creating client.
 
-        :type json_credentials_path: string
+        :type json_credentials_path: str
         :param json_credentials_path: The path to a private key file (this file
                                       was given to you when you created the
                                       service account). This file must contain
@@ -69,10 +69,10 @@ def from_service_account_p12(cls, client_email, private_key_path,
           Unless you have an explicit reason to use a PKCS12 key for your
           service account, we recommend using a JSON key.
 
-        :type client_email: string
+        :type client_email: str
         :param client_email: The e-mail attached to the service account.
 
-        :type private_key_path: string
+        :type private_key_path: str
         :param private_key_path: The path to a private key file (this file was
                                  given to you when you created the service
                                  account). This file must be in P12 format.
@@ -127,7 +127,7 @@ def __init__(self, credentials=None, http=None):
 class _ClientProjectMixin(object):
     """Mixin to allow setting the project on the client.
 
-    :type project: string
+    :type project: str
     :param project: the project which the client acts on behalf of. If not
                     passed falls back to the default inferred from the
                     environment.
@@ -160,7 +160,7 @@ class JSONClient(Client, _ClientProjectMixin):
     Assumes such APIs use the ``project`` and the client needs to store this
     value.
 
-    :type project: string
+    :type project: str
     :param project: the project which the client acts on behalf of. If not
                     passed falls back to the default inferred from the
                     environment.

packages/google-cloud-core/google/cloud/connection.py

@@ -162,24 +162,24 @@ def build_api_url(cls, path, query_params=None,
 
         Typically, you shouldn't need to use this method.
 
-        :type path: string
+        :type path: str
         :param path: The path to the resource (ie, ``'/b/bucket-name'``).
 
         :type query_params: dict or list
         :param query_params: A dictionary of keys and values (or list of
                              key-value pairs) to insert into the query
                              string of the URL.
 
-        :type api_base_url: string
+        :type api_base_url: str
         :param api_base_url: The base URL for the API endpoint.
                              Typically you won't have to provide this.
 
-        :type api_version: string
+        :type api_version: str
         :param api_version: The version of the API to call.
                             Typically you shouldn't provide this and instead
                             use the default for the library.
 
-        :rtype: string
+        :rtype: str
         :returns: The URL assembled from the pieces provided.
         """
         url = cls.API_URL_TEMPLATE.format(
@@ -199,16 +199,16 @@ def _make_request(self, method, url, data=None, content_type=None,
 
         Typically, you shouldn't need to use this method.
 
-        :type method: string
+        :type method: str
         :param method: The HTTP method to use in the request.
 
-        :type url: string
+        :type url: str
         :param url: The URL to send the request to.
 
-        :type data: string
+        :type data: str
         :param data: The data to send as the body of the request.
 
-        :type content_type: string
+        :type content_type: str
         :param content_type: The proper MIME type of the data provided.
 
         :type headers: dict
@@ -249,16 +249,16 @@ def _do_request(self, method, url, headers, data,
 
         Allows batch context managers to override and defer a request.
 
-        :type method: string
+        :type method: str
         :param method: The HTTP method to use in the request.
 
-        :type url: string
+        :type url: str
         :param url: The URL to send the request to.
 
         :type headers: dict
         :param headers: A dictionary of HTTP headers to send with the request.
 
-        :type data: string
+        :type data: str
         :param data: The data to send as the body of the request.
 
         :type target_object: object or :class:`NoneType`
@@ -282,11 +282,11 @@ def api_request(self, method, path, query_params=None,
         interact with the API using these primitives, this is the
         correct one to use.
 
-        :type method: string
+        :type method: str
         :param method: The HTTP method name (ie, ``GET``, ``POST``, etc).
                        Required.
 
-        :type path: string
+        :type path: str
         :param path: The path to the resource (ie, ``'/b/bucket-name'``).
                      Required.
 
@@ -295,23 +295,23 @@ def api_request(self, method, path, query_params=None,
                              key-value pairs) to insert into the query
                              string of the URL.
 
-        :type data: string
+        :type data: str
         :param data: The data to send as the body of the request. Default is
                      the empty string.
 
-        :type content_type: string
+        :type content_type: str
         :param content_type: The proper MIME type of the data provided. Default
                              is None.
 
         :type headers: dict
         :param headers: extra HTTP headers to be sent with the request.
 
-        :type api_base_url: string
+        :type api_base_url: str
         :param api_base_url: The base URL for the API endpoint.
                              Typically you won't have to provide this.
                              Default is the standard API base URL.
 
-        :type api_version: string
+        :type api_version: str
         :param api_version: The version of the API to call.  Typically
                             you shouldn't provide this and instead use
                             the default for the library.  Default is the

packages/google-cloud-core/google/cloud/credentials.py

@@ -97,7 +97,7 @@ def _get_signed_query_params(credentials, expiration, string_to_sign):
     :type expiration: int or long
     :param expiration: When the signed URL should expire.
 
-    :type string_to_sign: string
+    :type string_to_sign: str
     :param string_to_sign: The string to be signed by the credentials.
 
     :raises AttributeError: If :meth: sign_blob is unavailable.
@@ -184,7 +184,7 @@ def generate_signed_url(credentials, resource, expiration,
     :param credentials: Credentials object with an associated private key to
                         sign text.
 
-    :type resource: string
+    :type resource: str
     :param resource: A pointer to a specific resource
                      (typically, ``/bucket-name/path/to/blob.txt``).
 
@@ -220,7 +220,7 @@ def generate_signed_url(credentials, resource, expiration,
     :param generation: (Optional) A value that indicates which generation of
                        the resource to fetch.
 
-    :rtype: string
+    :rtype: str
     :returns: A signed URL you can use to access the resource
               until expiration.
     """

packages/google-cloud-core/google/cloud/exceptions.py

@@ -184,10 +184,10 @@ def make_exception(response, content, error_info=None, use_json=True):
     :param response: A response object that defines a status code as the
                      status attribute.
 
-    :type content: string or dictionary
+    :type content: str or dictionary
     :param content: The body of the HTTP error response.
 
-    :type error_info: string
+    :type error_info: str
     :param error_info: Optional string giving extra information about the
                        failed request.
 

packages/google-cloud-core/google/cloud/iterator.py

@@ -345,7 +345,7 @@ def next(self):
     def _has_next_page(self):
         """Determines whether or not there are more pages with results.
 
-        :rtype: boolean
+        :rtype: bool
         :returns: Whether the iterator has more pages.
         """
         if self.page_number == 0:

packages/google-cloud-core/google/cloud/streaming/buffered_stream.py

@@ -55,7 +55,7 @@ def __len__(self):
     def stream_exhausted(self):
         """Does the stream have bytes remaining beyond the buffer
 
-        :rtype: boolean
+        :rtype: bool
         :returns: Boolean indicating if the stream is exhausted.
         """
         return self._stream_at_end

packages/google-cloud-core/google/cloud/streaming/exceptions.py

@@ -32,7 +32,7 @@ class HttpError(CommunicationError):
     :type content: bytes
     :param content: payload of the response which returned the error
 
-    :type url: string
+    :type url: str
     :param url: URL of the response which returned the error
     """
     def __init__(self, response, content, url):
@@ -94,7 +94,7 @@ class RetryAfterError(HttpError):
     :type content: bytes
     :param content: payload of the response which returned the error.
 
-    :type url: string
+    :type url: str
     :param url: URL of the response which returned the error.
 
     :type retry_after: integer

packages/google-cloud-core/google/cloud/streaming/http_wrapper.py

@@ -258,7 +258,7 @@ def retry_after(self):
     def is_redirect(self):
         """Does this response contain a redirect
 
-        :rtype: boolean
+        :rtype: bool
         :returns: True if the status code indicates a redirect and the
                   'location' header is present.
         """