Changeset 14 for aws

Show
Ignore:
Timestamp:
07/18/07 06:30:44 (1 year ago)
Author:
devja..@anarkystic.com
Message:

most functionality in

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • aws/aws/client/rest.py

    r13 r14  
    66 
    77from twisted.internet import reactor, protocol, defer 
     8from twisted.web.client import _parse 
    89from twisted.web2 import stream, http_headers 
    910from twisted.web2.client import http 
     
    1213 
    1314AMAZON_HEADER_PREFIX = 'x-amz-' 
    14 AMAZON_NS = "http://s3.amazonaws.com/doc/2006-03-01/" 
     15AMAZON_S3_NS = "http://s3.amazonaws.com/doc/2006-03-01/" 
    1516METADATA_PREFIX = 'x-amz-meta-' 
    1617 
  • aws/aws/s3.py

    r13 r14  
    1515 
    1616from aws.client import rest  
    17 from aws import s3_example 
     17from aws import s3_example, util 
    1818 
    1919class Options(usage.Options): 
     
    272272    def read(self, *args, **kw): 
    273273        return self.body.read(*args, **kw) 
    274 def exhaust_stream(s): 
    275     buf = [] 
    276     def _buffer(s): 
    277         if s is None: 
    278             return "".join(buf) 
    279         buf.append(s) 
    280         next = defer.maybeDeferred(s.read) 
    281         next.addCallback(_buffer) 
    282         return next 
    283          
    284     d = defer.maybeDeferred(response.stream.read) 
    285     d.addCallback(_buffer) 
    286     return d 
    287274def build_old_response(response): 
    288275    def _assemble(b): 
     
    290277        o = OldResponse(response.code, headers, b) 
    291278        return o 
    292     d = exhaust_sream(response.stream) 
     279    d = util.exhaust_stream(response.stream) 
    293280    d.addCallback(_assemble) 
    294281    return d