Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Unified Diff: boto/ec2/elb/securitygroup.py

Issue 8386013: Merging in latest boto. (Closed) Base URL: svn://svn.chromium.org/boto
Patch Set: Redoing vendor drop by deleting and then merging. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « boto/ec2/elb/policies.py ('k') | boto/ec2/image.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: boto/ec2/elb/securitygroup.py
diff --git a/boto/s3/prefix.py b/boto/ec2/elb/securitygroup.py
similarity index 74%
copy from boto/s3/prefix.py
copy to boto/ec2/elb/securitygroup.py
index fc0f26ab58ae063bce32b60d916709c5858e1002..4f3779076848207a9198ca12f01b214f0eb01526 100644
--- a/boto/s3/prefix.py
+++ b/boto/ec2/elb/securitygroup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
+# Copyright (c) 2010 Reza Lotun http://reza.lotun.name
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
@@ -14,22 +14,25 @@
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-class Prefix:
- def __init__(self, bucket=None, name=None):
- self.bucket = bucket
- self.name = name
+class SecurityGroup(object):
+ def __init__(self, connection=None):
+ self.name = None
+ self.owner_alias = None
+
+ def __repr__(self):
+ return 'SecurityGroup(%s, %s)' % (self.name, self.owner_alias)
def startElement(self, name, attrs, connection):
- return None
+ pass
def endElement(self, name, value, connection):
- if name == 'Prefix':
+ if name == 'GroupName':
self.name = value
- else:
- setattr(self, name, value)
+ elif name == 'OwnerAlias':
+ self.owner_alias = value
« no previous file with comments | « boto/ec2/elb/policies.py ('k') | boto/ec2/image.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698