Update docstrings, fix lint issue which arose during the conflict resolution.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/950fed44 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/950fed44 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/950fed44 Branch: refs/heads/trunk Commit: 950fed4406dc7a57724070f607cf4c52a592c77c Parents: 480b465 Author: Tomaz Muraus <[email protected]> Authored: Fri Dec 27 12:53:09 2013 +0100 Committer: Tomaz Muraus <[email protected]> Committed: Fri Dec 27 13:00:19 2013 +0100 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/950fed44/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 1f11734..48fbdbc 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -873,7 +873,9 @@ class BaseEC2NodeDriver(NodeDriver): Parse the XML element and return a StorageVolume object. :param name: An optional name for the volume. If not provided - then the ID of the volume will be used in its place. + then either tag with a key "Name" or volume ID + will be used (which ever is available first in that + order). :type name: ``str`` :rtype: :class:`StorageVolume` @@ -2744,9 +2746,11 @@ class BaseEC2NodeDriver(NodeDriver): return {'instance_id': node.id, 'timestamp': timestamp, 'output': output} + def _get_resource_tags(self, element): """ - Return a dictionary with key/value pairs. + Parse tags from the provided element and return a dictionary with + key/value pairs. :rtype: ``dict`` """
