Merge lp://staging/~brian.curtin/ubuntu-sso-client/nam-setproxy-windows-workaround into lp://staging/ubuntu-sso-client
Proposed by
Brian Curtin
| Status: | Merged |
|---|---|
| Approved by: | Brian Curtin |
| Approved revision: | 1009 |
| Merged at revision: | 1009 |
| Proposed branch: | lp://staging/~brian.curtin/ubuntu-sso-client/nam-setproxy-windows-workaround |
| Merge into: | lp://staging/ubuntu-sso-client |
| Diff against target: |
29 lines (+7/-2) 2 files modified
ubuntu_sso/utils/webclient/qtnetwork.py (+3/-2) ubuntu_sso/utils/webclient/tests/test_qtnetwork.py (+4/-0) |
| To merge this branch: | bzr merge lp://staging/~brian.curtin/ubuntu-sso-client/nam-setproxy-windows-workaround |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michał Karnicki (community) | Approve | ||
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Only call QNetworkAccessM
Description of the change
rev 1008 made a change that broke Windows and Mac while trying to work with the version of PyQt available in Quantal. The added "self.nam.setProxy" call does not work on either platform, so this branch only calls that on linux, and adds a check to see that it's not called when it's not supposed to be.
This appears to be a bug in PyQt, as the setProxy method is given the proper object but receives a TypeError on Mac/Windows that the first argument isn't a QNetworkAccessM
To post a comment you must log in.
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Revision history for this message
| Michał Karnicki (karni) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
