diff -r 80215865d154 -r 52e9310626a8 mercurial/context.py
--- a/mercurial/context.py	Mon Oct 02 02:34:47 2017 -0700
+++ b/mercurial/context.py	Mon Oct 02 02:34:47 2017 -0700
@@ -2420,9 +2420,9 @@
         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()