620,621c620,621
<                     ass = _AddressState(ds.address)
<                     self.addressStateDB[str(ds.address)] = ass
---
>                     as = _AddressState(ds.address)
>                     self.addressStateDB[str(ds.address)] = as
628,629c628,629
<             for ass in self.addressStateDB.values():
<                 ass.setNextAttempt(rs, now)
---
>             for as in self.addressStateDB.values():
>                 as.setNextAttempt(rs, now)
646,647c646,647
<             for k, ass in self.addressStateDB.items():
<                 if have.has_key(ass.address):
---
>             for k, as in self.addressStateDB.items():
>                 if have.has_key(as.address):
649c649
<                 lastActivity = ass.getLastActivity()
---
>                 lastActivity = as.getLastActivity()
658c658
<             ass = self.addressStateDB[str(address)]
---
>             as = self.addressStateDB[str(address)]
660,662c660,662
<             ass = self.addressStateDB[str(address)] = _AddressState(address)
<             ass.setNextAttempt(self.retrySchedule, now)
<         return ass
---
>             as = self.addressStateDB[str(address)] = _AddressState(address)
>             as.setNextAttempt(self.retrySchedule, now)
>         return as
770,771c770,771
<         ass = self._getAddressState(ds.address)
<         return (o, ds, ass)
---
>         as = self._getAddressState(ds.address)
>         return (o, ds, as)
783,784c783,784
<                 ass = self._getAddressState(ds.address)
<                 assert ass.address == ds.address
---
>                 as = self._getAddressState(ds.address)
>                 assert as.address == ds.address