x/cloud-init
Code Issues Proposed changes

Consolidate on the use of urllib2 (rather than both urllib and urllib2)

Browse Source
This commit is contained in:
Soren Hansen 2009-08-11 09:34:27 +02:00
parent 56326b28b8
commit c21874b192
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ec2init/__init__.py
View File

@ -66,7 +66,7 @@ class EC2Init():
conn = urllib2.urlopen('%s/public-keys/' % self.meta_data_base_url) conn = urllib2.urlopen('%s/public-keys/' % self.meta_data_base_url)
data = conn.read() data = conn.read()
keyids = [line.split('=')[0] for line in data.split('\n')] keyids = [line.split('=')[0] for line in data.split('\n')]
return [urllib.urlopen('%s/public-keys/%d/openssh-key' % (self.meta_data_base_url, int(keyid))).read().rstrip() for keyid in keyids] return [urllib2.urlopen('%s/public-keys/%d/openssh-key' % (self.meta_data_base_url, int(keyid))).read().rstrip() for keyid in keyids]
def get_user_data(self): def get_user_data(self):
return boto.utils.get_instance_userdata() return boto.utils.get_instance_userdata()