Merge pull request #2580 from tswast/int-not-integer

dhermes · web-flow · commit 9038ef1d80fd · 2016-10-20T23:46:38.000-07:00
Replaces integer with int in types and rtypes.
diff --git a/packages/google-cloud-storage/google/cloud/storage/_helpers.py b/packages/google-cloud-storage/google/cloud/storage/_helpers.py
@@ -151,7 +151,7 @@ def _write_buffer_to_hash(buffer_object, hash_obj, digest_block_size=8192):
     :type hash_obj: object that implements update
     :param hash_obj: A hash object (MD5 or CRC32-C).
 
-    :type digest_block_size: integer
+    :type digest_block_size: int
     :param digest_block_size: The block size to write to the hash.
                               Defaults to 8192.
     """
diff --git a/packages/google-cloud-storage/google/cloud/storage/blob.py b/packages/google-cloud-storage/google/cloud/storage/blob.py
@@ -57,7 +57,7 @@ class Blob(_PropertyMixin):
     :type bucket: :class:`google.cloud.storage.bucket.Bucket`
     :param bucket: The bucket to which this blob belongs.
 
-    :type chunk_size: integer
+    :type chunk_size: int
     :param chunk_size: The size of a chunk of data whenever iterating (1 MB).
                        This must be a multiple of 256 KB per the API
                        specification.
@@ -85,7 +85,7 @@ def __init__(self, name, bucket, chunk_size=None, encryption_key=None):
     def chunk_size(self):
         """Get the blob's default chunk size.
 
-        :rtype: integer or ``NoneType``
+        :rtype: int or ``NoneType``
         :returns: The current blob's chunk size, if it is set.
         """
         return self._chunk_size
@@ -94,7 +94,7 @@ def chunk_size(self):
     def chunk_size(self, value):
         """Set the blob's default chunk size.
 
-        :type value: integer or ``NoneType``
+        :type value: int or ``NoneType``
         :param value: The current blob's chunk size, if it is set.
 
         :raises: :class:`ValueError` if ``value`` is not ``None`` and is not a
@@ -453,7 +453,7 @@ def upload_from_file(self, file_obj, rewind=False, size=None,
         :type content_type: str or ``NoneType``
         :param content_type: Optional type of content being uploaded.
 
-        :type num_retries: integer
+        :type num_retries: int
         :param num_retries: Number of upload retries. Defaults to 6.
 
         :type client: :class:`~google.cloud.storage.client.Client` or
@@ -773,7 +773,7 @@ def component_count(self):
 
         See: https://cloud.google.com/storage/docs/json_api/v1/objects
 
-        :rtype: integer or ``NoneType``
+        :rtype: int or ``NoneType``
         :returns: The component count (in case of a composed object) or
                   ``None`` if the property is not set locally. This property
                   will not be set on objects not created via ``compose``.
@@ -800,7 +800,7 @@ def generation(self):
 
         See: https://cloud.google.com/storage/docs/json_api/v1/objects
 
-        :rtype: integer or ``NoneType``
+        :rtype: int or ``NoneType``
         :returns: The generation of the blob or ``None`` if the property
                   is not set locally.
         """
@@ -872,7 +872,7 @@ def metageneration(self):
 
         See: https://cloud.google.com/storage/docs/json_api/v1/objects
 
-        :rtype: integer or ``NoneType``
+        :rtype: int or ``NoneType``
         :returns: The metageneration of the blob or ``None`` if the property
                   is not set locally.
         """
@@ -910,7 +910,7 @@ def size(self):
 
         See: https://cloud.google.com/storage/docs/json_api/v1/objects
 
-        :rtype: integer or ``NoneType``
+        :rtype: int or ``NoneType``
         :returns: The size of the blob or ``None`` if the property
                   is not set locally.
         """
diff --git a/packages/google-cloud-storage/google/cloud/storage/bucket.py b/packages/google-cloud-storage/google/cloud/storage/bucket.py
@@ -111,7 +111,7 @@ def blob(self, blob_name, chunk_size=None, encryption_key=None):
         :type blob_name: str
         :param blob_name: The name of the blob to be instantiated.
 
-        :type chunk_size: integer
+        :type chunk_size: int
         :param chunk_size: The size of a chunk of data whenever iterating
                            (1 MB). This must be a multiple of 256 KB per the
                            API specification.
@@ -626,7 +626,7 @@ def metageneration(self):
 
         See: https://cloud.google.com/storage/docs/json_api/v1/buckets
 
-        :rtype: integer or ``NoneType``
+        :rtype: int or ``NoneType``
         :returns: The metageneration of the bucket or ``None`` if the property
                   is not set locally.
         """
@@ -652,7 +652,7 @@ def project_number(self):
 
         See: https://cloud.google.com/storage/docs/json_api/v1/buckets
 
-        :rtype: integer or ``NoneType``
+        :rtype: int or ``NoneType``
         :returns: The project number that owns the bucket or ``None`` if the
                   property is not set locally.
         """
diff --git a/packages/google-cloud-storage/google/cloud/storage/client.py b/packages/google-cloud-storage/google/cloud/storage/client.py
@@ -227,7 +227,7 @@ def list_buckets(self, max_results=None, page_token=None, prefix=None,
 
         This implements "storage.buckets.list".
 
-        :type max_results: integer or ``NoneType``
+        :type max_results: int or ``NoneType``
         :param max_results: Optional. Maximum number of buckets to return.
 
         :type page_token: str or ``NoneType``
