Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fixups #1140

Open
wants to merge 2 commits into from

3 participants

@reversefold

No description provided.

@garnaat
Owner

I'm getting a conflict on this PR now. Could you rebase and resubmit? Thanks.

@reversefold

Rebased and pushed. In fixing the merge conflict I noticed there was a copy/paste error in the auth_region_name property declaration. This merge fixes that by replacing that with decorators.

@jamesls
Owner

I think the @foo.setter syntax is more concise than how it's currently done. However, even though boto "officially" supports >= 2.6, we do have 2.5 users, and given this is in boto.connection this would essentially break all 2.5 users (the setter attribute was added in 2.6). I'm inclined to keep the property definitions the way they are.

Thanks for the heads up on the auth_region_name though. I'll go ahead and fix that as a separate commit so your pull request can stay focused on a single issue.

@reversefold

I see....I assumed that since the requirements said python 2.6 that I could use a 2.6 feature. I'll switch it back in my branch.

@reversefold

Pull request updated. I've still changed 2 properties to @property but those should be fine with python 2.5 since there are no setters.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 2 deletions.
  1. +2 −1  boto/connection.py
  2. +1 −1  boto/ec2/connection.py
View
3  boto/connection.py
@@ -1007,7 +1007,8 @@ def make_request(self, action, params=None, path='/', verb='GET'):
http_request.params['Version'] = self.APIVersion
return self._mexe(http_request)
- def build_list_params(self, params, items, label):
+ @staticmethod
+ def build_list_params(params, items, label):
if isinstance(items, basestring):
items = [items]
for i in range(1, len(items) + 1):
View
2  boto/ec2/connection.py
@@ -1623,7 +1623,7 @@ def get_all_volumes(self, volume_ids=None, filters=None):
as the value. The set of allowable filter
names/values is dependent on the request
being performed. Check the EC2 API guide
- for details.
+ for details at http://goo.gl/bYK8w
:rtype: list of :class:`boto.ec2.volume.Volume`
:return: The requested Volume objects
Something went wrong with that request. Please try again.