diff options
| author | Soren Hansen <soren@canonical.com> | 2009-08-11 09:34:27 +0200 |
|---|---|---|
| committer | Soren Hansen <soren@canonical.com> | 2009-08-11 09:34:27 +0200 |
| commit | c21874b1921a65c6864dbb7d7e73e787aef6aeba (patch) | |
| tree | 23aee3d4ad2e20b6c2465ea808469962c5dc8b0f | |
| parent | 56326b28b8c3da7a8320e3d01c2a02b2e80c2fc2 (diff) | |
| download | vyos-cloud-init-c21874b1921a65c6864dbb7d7e73e787aef6aeba.tar.gz vyos-cloud-init-c21874b1921a65c6864dbb7d7e73e787aef6aeba.zip | |
Consolidate on the use of urllib2 (rather than both urllib and urllib2)
| -rw-r--r-- | ec2init/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ec2init/__init__.py b/ec2init/__init__.py index 5c316770..0f161d7d 100644 --- a/ec2init/__init__.py +++ b/ec2init/__init__.py @@ -66,7 +66,7 @@ class EC2Init(): conn = urllib2.urlopen('%s/public-keys/' % self.meta_data_base_url) data = conn.read() 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): return boto.utils.get_instance_userdata() |