x/cloud-init
Code Issues Proposed changes

pep8 and pylint fixups

Browse Source
This commit is contained in:
Scott Moser
2012-11-12 12:23:44 -05:00
parent 37042f6f14
commit be5e996a7f
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cloudinit/ec2_utils.py
View File

@@ -17,10 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import pkg_resources
from pkg_resources import parse_version
import cloudinit.util as util
import cloudinit.url_helper as uh
from pkg_resources import parse_version as pver
import boto.utils as boto_utils
@@ -36,7 +33,7 @@ import boto.utils as boto_utils
BOTO_LAZY = False
try:
_boto_lib = pkg_resources.get_distribution('boto')
if _boto_lib.parsed_version > parse_version("2.5.2"):
if _boto_lib.parsed_version > pver("2.5.2"): # pylint: disable=E1103
BOTO_LAZY = True
except pkg_resources.DistributionNotFound:
pass
@@ -47,7 +44,7 @@ def _unlazy_dict(mp):
return mp
if not BOTO_LAZY:
return mp
for (k, v) in mp.items():
for (_k, v) in mp.items():
_unlazy_dict(v)
return mp

2
cloudinit/sources/DataSourceCloudStack.py
View File

@@ -116,7 +116,7 @@ class DataSourceCloudStack(sources.DataSource):
return False
start_time = time.time()
self.userdata_raw = ec2.get_instance_userdata(self.api_ver,
self.metadata_address)
self.metadata_address)
self.metadata = ec2.get_instance_metadata(self.api_ver,
self.metadata_address)
LOG.debug("Crawl of metadata service took %s seconds",

2
cloudinit/sources/DataSourceEc2.py
View File

@@ -65,7 +65,7 @@ class DataSourceEc2(sources.DataSource):
return False
start_time = time.time()
self.userdata_raw = ec2.get_instance_userdata(self.api_ver,
self.metadata_address)
self.metadata_address)
self.metadata = ec2.get_instance_metadata(self.api_ver,
self.metadata_address)
LOG.debug("Crawl of metadata service took %s seconds",