Merge pull request #368 from tseaver/annotate_pylintrc_w_defaults_and…

…_rationale

Annotate pylintrc w defaults and rationale

gcloud/datastore/helpers.py

@@ -74,7 +74,7 @@ def key_from_protobuf(pb):
     return Key(path, namespace, dataset_id)
 
 
-def _get_protobuf_attribute_and_value(val):
+def _pb_attr_value(val):
     """Given a value, return the protobuf attribute name and proper value.
 
     The Protobuf API uses different attribute names
@@ -96,9 +96,9 @@ def _get_protobuf_attribute_and_value(val):
 
     For example:
 
-    >>> _get_protobuf_attribute_and_value(1234)
+    >>> _pb_attr_value(1234)
     ('integer_value', 1234)
-    >>> _get_protobuf_attribute_and_value('my_string')
+    >>> _pb_attr_value('my_string')
     ('string_value', 'my_string')
 
     :type val: `datetime.datetime`, :class:`gcloud.datastore.key.Key`,
@@ -230,7 +230,7 @@ def _set_protobuf_value(value_pb, val):
         value_pb.Clear()
         return
 
-    attr, val = _get_protobuf_attribute_and_value(val)
+    attr, val = _pb_attr_value(val)
     if attr == 'key_value':
         value_pb.key_value.CopyFrom(val)
     elif attr == 'entity_value':

gcloud/datastore/test_helpers.py

@@ -118,12 +118,12 @@ def test_w_path_in_pb(self):
         self.assertEqual(key.path(), _PATH)
 
 
-class Test__get_protobuf_attribute_and_value(unittest2.TestCase):
+class Test__pb_attr_value(unittest2.TestCase):
 
     def _callFUT(self, val):
-        from gcloud.datastore.helpers import _get_protobuf_attribute_and_value
+        from gcloud.datastore.helpers import _pb_attr_value
 
-        return _get_protobuf_attribute_and_value(val)
+        return _pb_attr_value(val)
 
     def test_datetime_naive(self):
         import calendar

gcloud/storage/key.py

@@ -126,9 +126,11 @@ def public_url(self):
         :rtype: `string`
         :returns: The public URL for this key.
         """
-        return '{storage_base_url}/{self.bucket.name}/{self.name}'.format(
+        return '{storage_base_url}/{bucket_name}/{key_name}'.format(
             storage_base_url='http://commondatastorage.googleapis.com',
-            self=self)
+            key_name=self.name,
+            bucket_name=self.bucket.name,
+            )
 
     def generate_signed_url(self, expiration, method='GET'):
         """Generates a signed URL for this key.
@@ -151,7 +153,10 @@ def generate_signed_url(self, expiration, method='GET'):
         :returns: A signed URL you can use to access the resource
                   until expiration.
         """
-        resource = '/{self.bucket.name}/{self.name}'.format(self=self)
+        resource = '/{bucket_name}/{key_name}'.format(
+            key_name=self.name,
+            bucket_name=self.bucket.name,
+            )
         return self.connection.generate_signed_url(resource=resource,
                                                    expiration=expiration,
                                                    method=method)