Merge lp://staging/~mitya57/piston-mini-client/lp1105215 into lp://staging/piston-mini-client
Proposed by
Dmitry Shachnev
| Status: | Merged |
|---|---|
| Approved by: | Barry Warsaw |
| Approved revision: | 71 |
| Merged at revision: | 71 |
| Proposed branch: | lp://staging/~mitya57/piston-mini-client/lp1105215 |
| Merge into: | lp://staging/piston-mini-client |
| Diff against target: |
14 lines (+2/-2) 1 file modified
piston_mini_client/__init__.py (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~mitya57/piston-mini-client/lp1105215 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Barry Warsaw | Approve | ||
|
Review via email:
|
|||
Description of the change
This should fix bug 1105215 (socket.gaierror doesn't have "message" attribute, but has "strerror" instead).
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
If we only care about Python 3.3, maybe it's better to catch OSError, since socket.error is a deprecated alias for OSError now, and socket.gaierror is a subclass of OSError. I guess it's not that big of a deal.