Skip to content

Commit

Permalink
Fixing remaining PEP8 long line issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
dhermes committed Oct 2, 2014
1 parent 0b4aa56 commit 39101ae
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 10 deletions.
5 changes: 4 additions & 1 deletion gcloud/datastore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ def get_connection(client_email, private_key_path):


def get_dataset(dataset_id, client_email, private_key_path):
"""Shortcut method to establish a connection to a particular dataset in the Cloud Datastore.
"""Establish a connection to a particular dataset in the Cloud Datastore.
This is a shortcut method for creating a connection and using it
to connect to a dataset.
You'll generally use this as the first call to working with the API:
Expand Down
9 changes: 6 additions & 3 deletions gcloud/datastore/entity.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def __init__(self, dataset=None, kind=None):
self._key = None

def dataset(self):
"""Get the :class:`gcloud.datastore.dataset.Dataset` in which this entity belongs.
"""Get the :class:`.dataset.Dataset` in which this entity belongs.
:rtype: :class:`gcloud.datastore.dataset.Dataset`
:returns: The Dataset containing the entity if there is a key,
Expand All @@ -86,7 +86,7 @@ def dataset(self):
return self.key().dataset()

def key(self, key=None):
"""Get or set the :class:`gcloud.datastore.key.Key` on the current entity.
"""Get or set the :class:`.datastore.key.Key` on the current entity.
:type key: :class:`glcouddatastore.key.Key`
:param key: The key you want to set on the entity.
Expand Down Expand Up @@ -122,7 +122,10 @@ def kind(self):

@classmethod
def from_key(cls, key):
"""Factory method for creating an entity based on the :class:`gcloud.datastore.key.Key`.
"""Create entity based on :class:`.datastore.key.Key`.
.. note::
This is a factory method.
:type key: :class:`gcloud.datastore.key.Key`
:param key: The key for the entity.
Expand Down
4 changes: 2 additions & 2 deletions gcloud/datastore/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ def _clone(self):
return clone

def to_protobuf(self):
"""Convert the :class:`Query` instance to a :class:`gcloud.datastore.datastore_v1_pb2.Query`.
"""Convert :class:`Query` instance to :class:`.datastore_v1_pb2.Query`.
:rtype: :class:`gclouddatstore.datastore_v1_pb2.Query`
:rtype: :class:`gcloud.datastore.datastore_v1_pb2.Query`
:returns: A Query protobuf that can be sent to the protobuf API.
"""
return self._pb
Expand Down
2 changes: 1 addition & 1 deletion gcloud/storage/acl.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ def save(self):


class DefaultObjectACL(BucketACL):
"""A subclass of BucketACL representing the default object ACL for a bucket."""
"""A class representing the default object ACL for a bucket."""

def save(self):
"""Save this ACL as the default object ACL for the current bucket."""
Expand Down
2 changes: 1 addition & 1 deletion gcloud/storage/bucket.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def get_all_keys(self):
return list(self)

def new_key(self, key):
"""Given a path name (or a Key), return a :class:`gcloud.storage.key.Key` object.
"""Given a path name (or Key), return a :class:`.storage.key.Key` object.
This is really useful when you're not sure
if you have a Key object or a string path name.
Expand Down
4 changes: 2 additions & 2 deletions gcloud/storage/iterator.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def __init__(self, connection):
super(BucketIterator, self).__init__(connection=connection, path='/b')

def get_items_from_response(self, response):
"""Factory method which yields :class:`gcloud.storage.bucket.Bucket` items from a response.
"""Factory method which yields :class:`.Bucket` items from a response.
:type response: dict
:param response: The JSON API response for a page of buckets.
Expand Down Expand Up @@ -174,7 +174,7 @@ def __init__(self, bucket):
connection=bucket.connection, path=bucket.path + '/o')

def get_items_from_response(self, response):
"""Factory method which yields :class:`gcloud.storage.key.Key` items from a response.
"""Factory method, yields :class:`.storage.key.Key` items from response.
:type response: dict
:param response: The JSON API response for a page of keys.
Expand Down

0 comments on commit 39101ae

Please sign in to comment.