From e91a3aea662a9095d4352f9c78cc11327e4d4e17 Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Mon, 11 Jul 2011 13:12:47 -0700
Subject: [PATCH] Pyflakes cleanup.

---
 generate_objects.py | 5 -----
 rand_readwrite.py   | 2 +-
 test_s3.py          | 2 --
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/generate_objects.py b/generate_objects.py
index 2ad577e..37dac5c 100755
--- a/generate_objects.py
+++ b/generate_objects.py
@@ -1,16 +1,11 @@
 #! /usr/bin/python
 
-from boto.s3.connection import OrdinaryCallingFormat
-from boto.s3.connection import S3Connection
 from boto.s3.key import Key
 from optparse import OptionParser
-from realistic import RandomContentFile
 import realistic
 import traceback
 import random
 import common
-import yaml
-import boto
 import sys
 
 
diff --git a/rand_readwrite.py b/rand_readwrite.py
index eb72e65..d716906 100755
--- a/rand_readwrite.py
+++ b/rand_readwrite.py
@@ -74,7 +74,7 @@ def writer(seconds, bucket, name=None, queue=None, quantity=1, file_size=1, file
             files = generate_objects.get_random_files(quantity, 1024*file_size, 1024*file_stddev, r)
 
             start = time.clock()
-            keys = generate_objects.upload_objects(bucket, files, r2)
+            generate_objects.upload_objects(bucket, files, r2)
             end = time.clock()
             elapsed = end - start
 
diff --git a/test_s3.py b/test_s3.py
index 03c457b..0b30651 100644
--- a/test_s3.py
+++ b/test_s3.py
@@ -9,7 +9,6 @@ import operator
 import os
 import random
 import string
-import time
 import socket
 
 from nose.tools import eq_ as eq
@@ -831,7 +830,6 @@ def test_object_set_valid_acl():
     key.set_xml_acl(XML_1)
 
 def test_object_giveaway():
-    obj = _setup_access(bucket_acl='public-read', object_acl='public-read-write')
     CORRECT_ACL = '<?xml version="1.0" encoding="UTF-8"?><AccessControlPolicy xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Owner><ID>' + config.main.user_id + '</ID></Owner><AccessControlList><Grant><Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser"><ID>' + config.main.user_id + '</ID></Grantee><Permission>FULL_CONTROL</Permission></Grant></AccessControlList></AccessControlPolicy>'
     WRONG_ACL = '<?xml version="1.0" encoding="UTF-8"?><AccessControlPolicy xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Owner><ID>' + config.alt.user_id + '</ID></Owner><AccessControlList><Grant><Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser"><ID>' + config.alt.user_id + '</ID></Grantee><Permission>FULL_CONTROL</Permission></Grant></AccessControlList></AccessControlPolicy>'
     bucket = get_new_bucket()