From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Tue, 26 Jul 2011 16:35:17 +0000 (-0700)
Subject: Avoid built-in "file" as variable name.
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1993c33ee3ac0f5046e83f3aec6ba35680ff42c5;p=s3-tests.git

Avoid built-in "file" as variable name.
---

diff --git a/s3tests/rand_readwrite.py b/s3tests/rand_readwrite.py
index 16d7a91d..398fc0e1 100644
--- a/s3tests/rand_readwrite.py
+++ b/s3tests/rand_readwrite.py
@@ -116,13 +116,13 @@ def parse_options():
 
     return parser.parse_args()
 
-def write_file(bucket, file_name, file):
+def write_file(bucket, file_name, fp):
     """
     Write a single file to the bucket using the file_name.
     This is used during the warmup to initialize the files.
     """
     key = bucket.new_key(file_name)
-    key.set_contents_from_file(file)
+    key.set_contents_from_file(fp)
 
 def main():
     # parse options
@@ -166,12 +166,12 @@ def main():
         print "Uploading initial set of {num} files".format(num=config.files.num)
         warmup_pool = gevent.pool.Pool(size=100)
         for file_name in file_names:
-            file = next(files)
+            fp = next(files)
             warmup_pool.spawn_link_exception(
                 write_file,
                 bucket=bucket,
                 file_name=file_name,
-                file=file,
+                fp=fp,
                 )
         warmup_pool.join()