Merge lp://staging/~gary/lazr.restful/bug691841 into lp://staging/lazr.restful
Proposed by
Gary Poster
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Robert Collins | ||||
| Approved revision: | 160 | ||||
| Merged at revision: | 160 | ||||
| Proposed branch: | lp://staging/~gary/lazr.restful/bug691841 | ||||
| Merge into: | lp://staging/lazr.restful | ||||
| Diff against target: |
72 lines (+21/-16) 2 files modified
src/lazr/restful/example/base/tests/entry.txt (+2/-2) src/lazr/restful/metazcml.py (+19/-14) |
||||
| To merge this branch: | bzr merge lp://staging/~gary/lazr.restful/bug691841 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Robert Collins (community) | Approve | ||
| Benji York | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch makes lazr.restful's tests pass in 2.6 and 2.7 (they were breaking in 2.7).
Comments 2 and 3 of bug 691841 describe the rationale for the two changes. Briefly, for one change, 2.7's inspect.is_class now is more discerning and recognizes that interfaces are not actually classes, so we need to accommodate that. For another change, None is no longer allowed as a header value in Python2.7's httplib.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks great to me.