[PATCH 6 of 6] rename some variables to avoid shadowing module names/functions

[timeless]

On Tue, May 3, 2011 at 10:48 PM, Matt Mackall <mpm at selenic.com> wrote:
> On Sun, 2011-05-01 at 14:16 -0500, timeless wrote:
>>      def recover(self):
>> -        lock = self.lock()
>> +        repolock = self.lock()
>
> Don't really like these changes, as this is our standard locking
> pattern. It might be better to change the lock import.

Yeah, I'm not surprised here. I don't know enough about python and
doubt I'll have the time to deal with fixing this one. If someone
wants to add the pyflakes test for this shadow they'll just have to
include the lock instances or fix it.