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

Replaces integer with int in types and rtypes.

Author: dhermes

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

@@ -24,10 +24,10 @@ class BufferedStream(object):
     :type stream:  readable file-like object
     :param stream:  the stream to be buffered
 
-    :type start: integer
+    :type start: int
     :param start: the starting point in the stream
 
-    :type size: integer
+    :type size: int
     :param size:  the size of the buffer
     """
     def __init__(self, stream, start, size):
@@ -64,7 +64,7 @@ def stream_exhausted(self):
     def stream_end_position(self):
         """Point to which stream was read into the buffer
 
-        :rtype: integer
+        :rtype: int
         :returns: The end-position of the stream.
         """
         return self._end_pos
@@ -73,15 +73,15 @@ def stream_end_position(self):
     def _bytes_remaining(self):
         """Bytes remaining to be read from the buffer
 
-        :rtype: integer
+        :rtype: int
         :returns: The number of bytes remaining.
         """
         return len(self._buffered_data) - self._buffer_pos
 
     def read(self, size=None):
         """Read bytes from the buffer.
 
-        :type size: integer or None
+        :type size: int or None
         :param size: How many bytes to read (defaults to all remaining bytes).
 
         :rtype: str

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

@@ -50,7 +50,7 @@ def __str__(self):
     def status_code(self):
         """Status code for the response.
 
-        :rtype: integer
+        :rtype: int
         :returns: the code
         """
         return int(self.response['status'])
@@ -97,7 +97,7 @@ class RetryAfterError(HttpError):
     :type url: str
     :param url: URL of the response which returned the error.
 
-    :type retry_after: integer
+    :type retry_after: int
     :param retry_after: seconds to wait before retrying.
     """
     def __init__(self, response, content, url, retry_after):

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

@@ -77,7 +77,7 @@ def _httplib2_debug_level(http_request, level, http=None):
     :type http_request: :class:`Request`
     :param http_request: the request to be logged.
 
-    :type level: integer
+    :type level: int
     :param level: the debuglevel for logging.
 
     :type http: :class:`httplib2.Http`, or ``None``
@@ -191,7 +191,7 @@ def _process_content_range(content_range):
     :type content_range: str
     :param content_range: the header value being parsed.
 
-    :rtype: integer
+    :rtype: int
     :returns: the length of the response chunk.
     """
     _, _, range_spec = content_range.partition(' ')
@@ -221,7 +221,7 @@ def length(self):
         Exposed as an attribute since using ``len()`` directly can fail
         for responses larger than ``sys.maxint``.
 
-        :rtype: integer or long
+        :rtype: int or long
         :returns: The length of the response.
         """
         if 'content-encoding' in self.info and 'content-range' in self.info:
@@ -239,7 +239,7 @@ def length(self):
     def status_code(self):
         """HTTP status code
 
-        :rtype: integer
+        :rtype: int
         :returns: The response status code.
         """
         return int(self.info['status'])
@@ -248,7 +248,7 @@ def status_code(self):
     def retry_after(self):
         """Retry interval (if set).
 
-        :rtype: integer
+        :rtype: int
         :returns: interval in seconds
         """
         if 'retry-after' in self.info:
@@ -319,7 +319,7 @@ def _make_api_request_no_retry(http, http_request, redirections=_REDIRECTIONS):
     :type http_request: :class:`Request`
     :param http_request: the request to send.
 
-    :type redirections: integer
+    :type redirections: int
     :param redirections: Number of redirects to follow.
 
     :rtype: :class:`Response`
@@ -363,11 +363,11 @@ def make_api_request(http, http_request, retries=7,
     :type http_request: :class:`Request`
     :param http_request: the request to send.
 
-    :type retries: integer
+    :type retries: int
     :param retries: Number of retries to attempt on retryable
                     responses (such as 429 or 5XX).
 
-    :type redirections: integer
+    :type redirections: int
     :param redirections: Number of redirects to follow.
 
     :rtype: :class:`Response`

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

@@ -23,7 +23,7 @@ class StreamSlice(object):
     :type stream:  readable file-like object
     :param stream:  the stream to be buffered.
 
-    :type max_bytes: integer
+    :type max_bytes: int
     :param max_bytes: maximum number of bytes to return in the slice.
     """
     def __init__(self, stream, max_bytes):
@@ -51,7 +51,7 @@ def length(self):
 
            For 32-bit python2.x, len() cannot exceed a 32-bit number.
 
-        :rtype: integer
+        :rtype: int
         :returns: The max "length" of the stream.
         """
         return self._max_bytes
@@ -65,7 +65,7 @@ def read(self, size=None):
         slice indicates we should still be able to read more bytes, we
         raise :exc:`IncompleteRead`.
 
-        :type size: integer or None
+        :type size: int or None
         :param size: If provided, read no more than size bytes from the stream.
 
         :rtype: bytes

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

@@ -55,7 +55,7 @@ class _Transfer(object):
     :type close_stream: bool
     :param close_stream: should this instance close the stream when deleted
 
-    :type chunksize: integer
+    :type chunksize: int
     :param chunksize: the size of chunks used to download/upload a file.
 
     :type auto_transfer: bool
@@ -65,7 +65,7 @@ class _Transfer(object):
     :type http: :class:`httplib2.Http` (or workalike)
     :param http: Http instance used to perform requests.
 
-    :type num_retries: integer
+    :type num_retries: int
     :param num_retries: how many retries should the transfer attempt
     """
 
@@ -131,7 +131,7 @@ def bytes_http(self, value):
     def num_retries(self):
         """How many retries should the transfer attempt
 
-        :rtype: integer
+        :rtype: int
         :returns: The number of retries allowed.
         """
         return self._num_retries
@@ -140,7 +140,7 @@ def num_retries(self):
     def num_retries(self, value):
         """Update how many retries should the transfer attempt
 
-        :type value: integer
+        :type value: int
         """
         if not isinstance(value, six.integer_types):
             raise ValueError("num_retries: pass an integer")
@@ -280,7 +280,7 @@ def from_stream(cls, stream, auto_transfer=True, total_size=None, **kwds):
         :type stream: writable file-like object
         :param stream: the target file
 
-        :type total_size: integer or None
+        :type total_size: int or None
         :param total_size: total size of the file to be downloaded
 
         :type auto_transfer: bool
@@ -300,7 +300,7 @@ def from_stream(cls, stream, auto_transfer=True, total_size=None, **kwds):
     def progress(self):
         """Number of bytes have been downloaded.
 
-        :rtype: integer >= 0
+        :rtype: int >= 0
         :returns: The number of downloaded bytes.
         """
         return self._progress
@@ -309,7 +309,7 @@ def progress(self):
     def total_size(self):
         """Total number of bytes to be downloaded.
 
-        :rtype: integer or None
+        :rtype: int or None
         :returns: The total number of bytes to download.
         """
         return self._total_size
@@ -392,11 +392,11 @@ def initialize_download(self, http_request, http):
     def _normalize_start_end(self, start, end=None):
         """Validate / fix up byte range.
 
-        :type start: integer
+        :type start: int
         :param start: start byte of the range:  if negative, used as an
                       offset from the end.
 
-        :type end: integer
+        :type end: int
         :param end: end byte of the range.
 
         :rtype: tuple, (start, end)
@@ -428,11 +428,11 @@ def _set_range_header(request, start, end=None):
         :type request: :class:`google.cloud.streaming.http_wrapper.Request`
         :param request: the request to update
 
-        :type start: integer
+        :type start: int
         :param start: start byte of the range:  if negative, used as an
                       offset from the end.
 
-        :type end: integer
+        :type end: int
         :param end: end byte of the range.
         """
         if start < 0:
@@ -454,10 +454,10 @@ def _compute_end_byte(self, start, end=None, use_chunks=True):
            - if we have no information about size, and don't want to
              use the chunksize, we'll return None.
 
-        :type start: integer
+        :type start: int
         :param start: start byte of the range.
 
-        :type end: integer or None
+        :type end: int or None
         :param end: suggested last byte of the range.
 
         :type use_chunks: bool
@@ -490,10 +490,10 @@ def _compute_end_byte(self, start, end=None, use_chunks=True):
     def _get_chunk(self, start, end):
         """Retrieve a chunk of the file.
 
-        :type start: integer
+        :type start: int
         :param start: start byte of the range.
 
-        :type end: integer or None
+        :type end: int or None
         :param end: end byte of the range.
 
         :rtype: :class:`google.cloud.streaming.http_wrapper.Response`
@@ -552,10 +552,10 @@ def get_range(self, start, end=None, use_chunks=True):
         (These variations correspond to those described in the HTTP 1.1
         protocol for range headers in RFC 2616, sec. 14.35.1.)
 
-        :type start: integer
+        :type start: int
         :param start: Where to start fetching bytes. (See above.)
 
-        :type end: integer or ``None``
+        :type end: int or ``None``
         :param end: Where to stop fetching bytes. (See above.)
 
         :type use_chunks: bool
@@ -625,7 +625,7 @@ class Upload(_Transfer):
     :type mime_type: str:
     :param mime_type: MIME type of the upload.
 
-    :type total_size: integer or None
+    :type total_size: int or None
     :param total_size: Total upload size for the stream.
 
     :type http: :class:`httplib2.Http` (or workalike)
@@ -700,7 +700,7 @@ def from_stream(cls, stream, mime_type,
         :type mime_type: str
         :param mime_type:  MIMEtype of the file being uploaded
 
-        :type total_size: integer or None
+        :type total_size: int or None
         :param total_size:  Size of the file being uploaded
 
         :type auto_transfer: bool or None
@@ -741,7 +741,7 @@ def mime_type(self):
     def progress(self):
         """Bytes uploaded so far
 
-        :rtype: integer
+        :rtype: int
         :returns: The amount uploaded so far.
         """
         return self._progress
@@ -775,7 +775,7 @@ def strategy(self, value):
     def total_size(self):
         """Total size of the stream to be uploaded.
 
-        :rtype: integer or None
+        :rtype: int or None
         :returns: The total size to be uploaded.
         """
         return self._total_size
@@ -784,7 +784,7 @@ def total_size(self):
     def total_size(self, value):
         """Update total size of the stream to be uploaded.
 
-        :type value: integer or None
+        :type value: int or None
         :param value: the size
         """
         self._ensure_uninitialized()
@@ -1048,7 +1048,7 @@ def _validate_chunksize(self, chunksize=None):
 
         Helper for :meth:`stream_file`.
 
-        :type chunksize: integer or None
+        :type chunksize: int or None
         :param chunksize: the chunk size to be tested.
 
         :raises: :exc:`ValueError` if ``chunksize`` is not a multiple
@@ -1112,7 +1112,7 @@ def _send_media_request(self, request, end):
         :type request: :class:`google.cloud.streaming.http_wrapper.Request`
         :param request: the request to upload
 
-        :type end: integer
+        :type end: int
         :param end: end byte of the to be uploaded
 
         :rtype: :class:`google.cloud.streaming.http_wrapper.Response`
@@ -1140,7 +1140,7 @@ def _send_media_body(self, start):
 
         Helper for :meth:`stream_file`:
 
-        :type start: integer
+        :type start: int
         :param start: start byte of the range.
 
         :rtype: :class:`google.cloud.streaming.http_wrapper.Response`
@@ -1170,7 +1170,7 @@ def _send_chunk(self, start):
 
         Helper for :meth:`stream_file`:
 
-        :type start: integer
+        :type start: int
         :param start: start byte of the range.
 
         :rtype: :class:`google.cloud.streaming.http_wrapper.Response`

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

@@ -27,10 +27,10 @@ def calculate_wait_for_retry(retry_attempt):
     random amount of jitter is added to spread out retry attempts from
     different clients.
 
-    :type retry_attempt: integer
+    :type retry_attempt: int
     :param retry_attempt: Retry attempt counter.
 
-    :rtype: integer
+    :rtype: int
     :returns: Number of seconds to wait before retrying request.
     """
     wait_time = 2 ** retry_attempt