Merge lp://staging/~cody-somerville/offspring/fix-offspring-on-python2.7 into lp://staging/offspring
Proposed by
Cody A.W. Somerville
Status: | Merged |
---|---|
Approved by: | Timothy R. Chavez |
Approved revision: | 156 |
Merged at revision: | 152 |
Proposed branch: | lp://staging/~cody-somerville/offspring/fix-offspring-on-python2.7 |
Merge into: | lp://staging/offspring |
Diff against target: |
153 lines (+74/-8) 5 files modified
Makefile (+1/-1) config/offspring-web.wsgi (+4/-1) docs/install.rst (+3/-2) lib/offspring/networking.py (+11/-4) lib/offspring/tests/test_networking.py (+55/-0) |
To merge this branch: | bzr merge lp://staging/~cody-somerville/offspring/fix-offspring-on-python2.7 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Timothy R. Chavez | Approve | ||
Review via email: mp+116500@code.staging.launchpad.net |
Description of the change
Removes need to run Offspring on python2.6 by fixing compatibility issues with >python2.7 xmlrpclib API.
Still need to do further smoke testing of codebase running python2.7 but wanted to get this initial work up for review. Additional suggestions for improved tests appreciated.
To post a comment you must log in.
51 + connection = TimeoutHTTPConn ection( host)
52 + self._connection = host, connection
Why does self._connection get set for sys.version_info >= 2.7 but not < 2.7?