Changeset 14

Timestamp:

07/18/07 06:30:44 (1 year ago)

Author:

devja..@anarkystic.com

Message:

most functionality in

Files:

• aws/aws/client/rest.py (modified) (2 diffs)
• aws/aws/s3.py (modified) (3 diffs)
• aws/aws/sqs.py (added)
• aws/aws/util.py (added)
• aws/test_sqs.py (added)

aws/aws/client/rest.py

@@ -6 +6 @@
-
-from twisted.internet import reactor, protocol, defer
+from twisted.web.client import _parse
-from twisted.web2 import stream, http_headers
-from twisted.web2.client import http
@@ -12 +13 @@
-
-AMAZON_HEADER_PREFIX = 'x-amz-'
-
+S3_
-METADATA_PREFIX = 'x-amz-meta-'
-

aws/aws/s3.py

@@ -15 +15 @@
-
-from aws.client import rest 
-
+, util
-
-class Options(usage.Options):
@@ -272 +272 @@
-    def read(self, *args, **kw):
-        return self.body.read(*args, **kw)
-def exhaust_stream(s):
-    buf = []
-    def _buffer(s):
-        if s is None:
-            return "".join(buf)
-        buf.append(s)
-        next = defer.maybeDeferred(s.read)
-        next.addCallback(_buffer)
-        return next
-        
-    d = defer.maybeDeferred(response.stream.read)
-    d.addCallback(_buffer)
-    return d
-def build_old_response(response):
-    def _assemble(b):
@@ -290 +277 @@
-        o = OldResponse(response.code, headers, b)
-        return o
-exhaust_s
+util.exhaust_st
-    d.addCallback(_assemble)
-    return d