From c21874b1921a65c6864dbb7d7e73e787aef6aeba Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Tue, 11 Aug 2009 09:34:27 +0200 Subject: Consolidate on the use of urllib2 (rather than both urllib and urllib2) --- ec2init/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ec2init/__init__.py') 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() -- cgit v1.2.3