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

Replace types string with str.

Author: dhermes

packages/google-cloud-dns/google/cloud/dns/changes.py

@@ -74,7 +74,7 @@ def _set_properties(self, resource):
     def path(self):
         """URL path for change set APIs.
 
-        :rtype: string
+        :rtype: str
         :returns: the path based on project, zone, and change set names.
         """
         return '/projects/%s/managedZones/%s/changes/%s' % (
@@ -84,7 +84,7 @@ def path(self):
     def name(self):
         """Name of the change set.
 
-        :rtype: string or ``NoneType``
+        :rtype: str or ``NoneType``
         :returns: Name, as set by the back-end, or None.
         """
         return self._properties.get('id')
@@ -93,7 +93,7 @@ def name(self):
     def name(self, value):
         """Update name of the change set.
 
-        :type value: string
+        :type value: str
         :param value: New name for the changeset.
         """
         if not isinstance(value, six.string_types):
@@ -104,7 +104,7 @@ def name(self, value):
     def status(self):
         """Status of the change set.
 
-        :rtype: string or ``NoneType``
+        :rtype: str or ``NoneType``
         :returns: Status, as set by the back-end, or None.
         """
         return self._properties.get('status')

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

@@ -24,7 +24,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 zone.  If not passed,
                     falls back to the default inferred from the environment.
@@ -88,14 +88,14 @@ def list_zones(self, max_results=None, page_token=None):
     def zone(self, name, dns_name=None, description=None):
         """Construct a zone bound to this client.
 
-        :type name: string
+        :type name: str
         :param name: Name of the zone.
 
-        :type dns_name: string or :class:`NoneType`
+        :type dns_name: str or :class:`NoneType`
         :param dns_name: DNS name of the zone.  If not passed, then calls
                          to :meth:`zone.create` will fail.
 
-        :type description: string or :class:`NoneType`
+        :type description: str or :class:`NoneType`
         :param description: the description for the zone.  If not passed,
                             defaults to the value of 'dns_name'.
 

packages/google-cloud-dns/google/cloud/dns/resource_record_set.py

@@ -23,10 +23,10 @@ class ResourceRecordSet(object):
     See:
     https://cloud.google.com/dns/api/v1/resourceRecordSets
 
-    :type name: string
+    :type name: str
     :param name: the name of the record set.
 
-    :type record_type: string
+    :type record_type: str
     :param record_type: the RR type of the zone.
 
     :type ttl: integer

packages/google-cloud-dns/google/cloud/dns/zone.py

@@ -29,18 +29,18 @@ class ManagedZone(object):
     See:
     https://cloud.google.com/dns/api/v1/managedZones
 
-    :type name: string
+    :type name: str
     :param name: the name of the zone
 
-    :type dns_name: string or :class:`NoneType`
+    :type dns_name: str or :class:`NoneType`
     :param dns_name: the DNS name of the zone.  If not passed, then calls
                      to :meth:`create` will fail.
 
     :type client: :class:`google.cloud.dns.client.Client`
     :param client: A client which holds credentials and project configuration
                    for the zone (which requires a project).
 
-    :type description: string or :class:`NoneType`
+    :type description: str or :class:`NoneType`
     :param description: the description for the zone.  If not passed, defaults
                         to the value of 'dns_name'.
     """
@@ -81,7 +81,7 @@ def from_api_repr(cls, resource, client):
     def project(self):
         """Project bound to the zone.
 
-        :rtype: string
+        :rtype: str
         :returns: the project (derived from the client).
         """
         return self._client.project
@@ -90,7 +90,7 @@ def project(self):
     def path(self):
         """URL path for the zone's APIs.
 
-        :rtype: string
+        :rtype: str
         :returns: the path based on project and dataste name.
         """
         return '/projects/%s/managedZones/%s' % (self.project, self.name)
@@ -117,7 +117,7 @@ def name_servers(self):
     def zone_id(self):
         """ID for the zone resource.
 
-        :rtype: string, or ``NoneType``
+        :rtype: str, or ``NoneType``
         :returns: the ID (None until set from the server).
         """
         return self._properties.get('id')
@@ -126,7 +126,7 @@ def zone_id(self):
     def description(self):
         """Description of the zone.
 
-        :rtype: string, or ``NoneType``
+        :rtype: str, or ``NoneType``
         :returns: The description as set by the user, or None (the default).
         """
         return self._properties.get('description')
@@ -135,7 +135,7 @@ def description(self):
     def description(self, value):
         """Update description of the zone.
 
-        :type value: string, or ``NoneType``
+        :type value: str, or ``NoneType``
         :param value: new description
 
         :raises: ValueError for invalid value types.
@@ -153,7 +153,7 @@ def name_server_set(self):
         See:
         https://cloud.google.com/dns/api/v1/managedZones#nameServerSet
 
-        :rtype: string, or ``NoneType``
+        :rtype: str, or ``NoneType``
         :returns: The name as set by the user, or None (the default).
         """
         return self._properties.get('nameServerSet')
@@ -162,7 +162,7 @@ def name_server_set(self):
     def name_server_set(self, value):
         """Update named set of DNS name servers.
 
-        :type value: string, or ``NoneType``
+        :type value: str, or ``NoneType``
         :param value: new title
 
         :raises: ValueError for invalid value types.
@@ -174,10 +174,10 @@ def name_server_set(self, value):
     def resource_record_set(self, name, record_type, ttl, rrdatas):
         """Construct a resource record set bound to this zone.
 
-        :type name: string
+        :type name: str
         :param name: Name of the record set.
 
-        :type record_type: string
+        :type record_type: str
         :param record_type: RR type
 
         :type ttl: integer
@@ -323,7 +323,7 @@ def list_resource_record_sets(self, max_results=None, page_token=None,
         :param max_results: maximum number of zones to return, If not
                             passed, defaults to a value set by the API.
 
-        :type page_token: string
+        :type page_token: str
         :param page_token: opaque marker for the next "page" of zones. If
                            not passed, the API will return the first page of
                            zones.
@@ -356,7 +356,7 @@ def list_changes(self, max_results=None, page_token=None, client=None):
         :param max_results: maximum number of zones to return, If not
                             passed, defaults to a value set by the API.
 
-        :type page_token: string
+        :type page_token: str
         :param page_token: opaque marker for the next "page" of zones. If
                            not passed, the API will return the first page of
                            zones.