# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2017-10-02 09:34:47
# Node ID 52e9310626a89975938c4ecbcf426954a083e784
# Parent  80215865d154d82d9cedd3da96454604bb2a9349

context: rename local 'attr' to 'attr_'

In the next diff we're going to import mercurial.thirdparty.attr, and pyflakes
complains about this if this rename isn't done.

Differential Revision: https://phab.mercurial-scm.org/D897

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -2420,9 +2420,9 @@ class overlayfilectx(committablefilectx)
         if reusable:
             # copy extra fields from originalfctx
             attrs = ['rawdata', 'rawflags', '_filenode', '_filerev']
-            for attr in attrs:
-                if util.safehasattr(originalfctx, attr):
-                    setattr(self, attr, getattr(originalfctx, attr))
+            for attr_ in attrs:
+                if util.safehasattr(originalfctx, attr_):
+                    setattr(self, attr_, getattr(originalfctx, attr_))
 
     def data(self):
         return self._datafunc()