txAWS

Merge lp://qastaging/~dreamhosters/txaws/920302-python2.5-compat into lp://qastaging/txaws

920302-python2.5-compat
Merge into trunk

Proposed by Duncan McGreggor on 2012-01-27

Status:

Merged

Approved by:

Duncan McGreggor on 2012-01-27

Approved revision:

118

Merged at revision:

127

Proposed branch:

lp://qastaging/~dreamhosters/txaws/920302-python2.5-compat

Merge into:

lp://qastaging/txaws

Diff against target:

522 lines (+172/-33)

17 files modified

Makefile (+7/-1)
txaws/client/discover/tests/test_command.py (+1/-1)
txaws/client/discover/tests/test_entry_point.py (+3/-3)
txaws/client/gui/tests/test_gtk.py (+1/-1)
txaws/s3/client.py (+42/-0)
txaws/s3/model.py (+18/-0)
txaws/s3/tests/test_acls.py (+1/-1)
txaws/s3/tests/test_client.py (+74/-1)
txaws/server/tests/test_call.py (+1/-1)
txaws/server/tests/test_exception.py (+1/-1)
txaws/server/tests/test_method.py (+2/-2)
txaws/server/tests/test_registry.py (+2/-2)
txaws/server/tests/test_resource.py (+2/-2)
txaws/server/tests/test_schema.py (+9/-9)
txaws/tests/test_credentials.py (+1/-1)
txaws/tests/test_util.py (+1/-1)
txaws/tests/test_wsdl.py (+6/-6)

To merge this branch:

bzr merge lp://qastaging/~dreamhosters/txaws/920302-python2.5-compat

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
txAWS Technical List		2012-01-27	Pending
Review via email: mp+90360@code.qastaging.launchpad.net

Description of the change

This branch takes care of the Python2.5 errors that were preventing the test suite from completing (some of the fixes involved test skips).

Revision history for this message

Arsene Rei (arsene-rei) wrote on 2012-01-27:

Just looking at the diff, it would seem the recent code for get bucket website is removed. Other than that it looks good.

Revision history for this message

Duncan McGreggor (oubiwann) wrote on 2012-01-27:

Yeah, craziness. Thanks for catching that. Not sure what happened... I feel safe in blaming git-bzr though ;-) Weird, too... 'cause it was a *partial* deletion.

Anyway, I've just pushed it back in.

lp://qastaging/~dreamhosters/txaws/920302-python2.5-compat updated on 2012-01-27

119. By Duncan McGreggor on 2012-01-27: Reverted a mysterious partial deletion of a new feature that landed today.
120. By Duncan McGreggor on 2012-01-27: Revision 115 reverted this change; putting it back.

Revision history for this message

Duncan McGreggor (oubiwann) wrote on 2012-01-27:

So... the diff that I'm looking at on my filesystem from version 112 to 120 does not look at all like what Launchpad is showing here.

Ah, looks like rev 124 on trunk got committed accidentally at some point. That should *not* happened (obviously). I guess it's really time to stop using git-bzr. A good chunk of what fixed the Python 2.5 errors was in that revision; the rest was clean-up. Ah, well.