Merge c9e2c6b into 70e76d7

src/allmydata/storage/backends/cloud/s3/s3_container.py

@@ -42,20 +42,22 @@ def __init__(self, access_key, secret_key, url, container_name, usertoken=None,
         creds = AWSCredentials(access_key=access_key, secret_key=secret_key)
         endpoint = AWSServiceEndpoint(uri=url)
 
-        query_factory = None
-        if usertoken is not None:
-            def make_query(*args, **kwargs):
+        def make_query(*args, **kwargs):
+            if usertoken is not None:
                 amz_headers = kwargs.get("amz_headers", {})
                 if producttoken is not None:
                     amz_headers["security-token"] = (usertoken, producttoken)
                 else:
                     amz_headers["security-token"] = usertoken
                 kwargs["amz_headers"] = amz_headers
 
-                return Query(*args, **kwargs)
-            query_factory = make_query
+            query = Query(*args, **kwargs)
+            if hasattr(query.factory, 'noisy'):
+                query.factory.noisy = False
 
-        self.client = S3Client(creds=creds, endpoint=endpoint, query_factory=query_factory)
+            return query
+
+        self.client = S3Client(creds=creds, endpoint=endpoint, query_factory=make_query)
         self.ServiceError = S3Error
 
     def _create(self):