fix codechecks: trailing whitespace, suspicious variable captures

This commit is contained in:
Brian Warner 2016-08-19 17:33:18 -07:00
parent 2e7c7d30c9
commit 32974775ff
2 changed files with 8 additions and 8 deletions

View File

@ -456,7 +456,7 @@ class MagicFolderAliceBobTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Rea
yield iterate(self.alice_magicfolder) # for windows
yield iterate(self.bob_magicfolder) # for windows
# check the state (XXX I had to switch the versions to 0; is that really right? why?)
yield self._check_version_in_dmd(self.alice_magicfolder, u"blam", 0)
yield self._check_version_in_local_db(self.alice_magicfolder, u"blam", 0)

View File

@ -281,18 +281,18 @@ class INotify(PollMixin):
def _do_pending_calls():
self._pending_call = None
for path in self._pending:
for path1 in self._pending:
if self._callbacks:
for cb in self._callbacks:
try:
cb(None, path, IN_CHANGED)
except Exception, e:
log.err(e)
cb(None, path1, IN_CHANGED)
except Exception, e2:
log.err(e2)
self._pending = set()
def _maybe_notify(path):
if path not in self._pending:
self._pending.add(path)
def _maybe_notify(path2):
if path2 not in self._pending:
self._pending.add(path2)
if self._state not in [STOPPING, STOPPED]:
_do_pending_calls()
# if self._pending_call is None and self._state not in [STOPPING, STOPPED]: