Merge lp://staging/~bac/python-memcached/bug-974632 into lp://staging/python-memcached
Proposed by
Brad Crittenden
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp://staging/~bac/python-memcached/bug-974632 | ||||
Merge into: | lp://staging/python-memcached | ||||
Diff against target: |
59 lines (+16/-5) 1 file modified
memcache.py (+16/-5) |
||||
To merge this branch: | bzr merge lp://staging/~bac/python-memcached/bug-974632 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sean Reifschneider | Disapprove | ||
Review via email: mp+101148@code.staging.launchpad.net |
Description of the change
Restore the previous behavior of readline() so that it returns None if the socket is closed. A new internal method _readline() is introduced to provide the uncaught _ConnectionDead
To post a comment you must log in.
Unmerged revisions
- 57. By Brad Crittenden
-
Provide a wrapper to handled _ConnectionDead
Errors so that readline() behaves as before.
I think this misses some cases that the current could would also raise an exception in. This is a good start, and helped me understand the problem, thanks for the patch, but I've made some other changes which include restoring the readline() back to not raising an exception in most cases, and the _unsafe_*() functions calling functions which explicitly request that readline() raise the exception.
I'm going to commit a change shortly, would you mind reviewing it and seeing if it fixes the issue?
Thanks,
Sean