Merge lp:~cmiller/desktopcouch/dbus-refs-explicit-and-rm-resolve-on-disappear into lp:desktopcouch
Proposed by
Chad Miller
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Chad Miller | ||||
Approved revision: | 81 | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~cmiller/desktopcouch/dbus-refs-explicit-and-rm-resolve-on-disappear | ||||
Merge into: | lp:desktopcouch | ||||
Diff against target: |
239 lines 2 files modified
desktopcouch/pair/couchdb_pairing/dbus_io.py (+35/-48) desktopcouch/replication.py (+9/-11) |
||||
To merge this branch: | bzr merge lp:~cmiller/desktopcouch/dbus-refs-explicit-and-rm-resolve-on-disappear | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eric Casteleijn (community) | Approve | ||
Review via email: mp+12747@code.launchpad.net |
Commit message
Be explicit in references, as evidently there is a way for the name/reference to disappear. (LP: #440072)
Do not attempt to resolve messages for nearby machines when they disappear.
Fix a few unreported bugs in error handling.
To post a comment you must log in.
in replication.py, the following imports are unused:
import threading
import logging.handlers
import desktopcouch
this is unconventionally indented and uses an undefined variable 'sn' (occurs twice):
return ""
this has an undefined variable 'remote_identifier'
and there are several long lines.
dbus_io
args is undefined in:
also, this scares me:
class LocationAdverti sement( Advertisement) :
kwargs. pop(stype)
super( LocationAdverti sement, self).__init__(
stype= location_ discovery_ service_ type, *args, **kwargs)
"""An advertised couchdb location. See Advertisement class."""
def __init__(self, *args, **kwargs):
if "stype" in kwargs:
class PairAdvertiseme nt(Advertisemen t):
kwargs. pop(stype)
super( PairAdvertiseme nt, self).__init__(
stype= invitations_ discovery_ service_ type, *args, **kwargs)
"""An advertised couchdb pairing opportunity. See Advertisement class."""
def __init__(self, *args, **kwargs):
if "stype" in kwargs:
Isn't it possible to make it a little more explicit? I think I would prefer:
kwargs. pop(kwargs[ "stype" ])