summaryrefslogtreecommitdiff
path: root/cloudinit/ec2_utils.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-03-19 09:32:04 -0400
committerScott Moser <smoser@ubuntu.com>2013-03-19 09:32:04 -0400
commit8fbe938228909e153afb88f189b269df60501510 (patch)
tree245d50cda87c6031a70bc5d9e858629cd65693a1 /cloudinit/ec2_utils.py
parent6591a7d35add188536dc9db1db0b9ceeaed887d7 (diff)
downloadvyos-cloud-init-8fbe938228909e153afb88f189b269df60501510.tar.gz
vyos-cloud-init-8fbe938228909e153afb88f189b269df60501510.zip
appease pylint and pep8
* cloudinit/distros/parsers/resolv_conf.py added some pylint overrides with 'plXXXXX' syntax. example: # pl51222 pylint: disable=E0102 The pl51222 there means: http://www.logilab.org/ticket/51222 This specific issue is present in 12.04 pylint, but not 13.04. * pylint doesn't like the requests special handling we have. which makes sense as it is only checking versus one specific version. * general pep8 and pylint cleanups.
Diffstat (limited to 'cloudinit/ec2_utils.py')
-rw-r--r--cloudinit/ec2_utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py
index 4812eccb..6b2754aa 100644
--- a/cloudinit/ec2_utils.py
+++ b/cloudinit/ec2_utils.py
@@ -145,6 +145,7 @@ def get_instance_userdata(api_version, metadata_address, ssl_details=None):
util.logexc(LOG, "Failed fetching userdata from url %s", ud_url)
return None
+
def get_instance_metadata(api_version, metadata_address, ssl_details=None):
md_url = combine_url(metadata_address, api_version)
md_url = combine_url(md_url, 'meta-data')