← Back to branch summary

~ubuntu-branches/ubuntu/karmic/python-boto/karmic

« back to all changes in this revision

Viewing changes to boto/s3/key.py

  • Committer: Bazaar Package Importer
  • Author(s): Eric Evans
  • Date: 2007-11-24 17:12:40 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20071124171240-11841t56xlqco4pw
Tags: 0.9d-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
boto/s3/key.py
103
103
    def update_metadata(self, d):
104
104
        self.metadata.update(d)
105
105
    
106
 
    def generate_url(self, expires_in, method='GET', headers=None):
 
106
    def generate_url(self, expires_in, method='GET',
 
107
                     headers=None, query_auth=True):
107
108
        path = '/%s/%s' % (self.bucket.name, self.name)
108
109
        path = urllib.quote(path)
109
110
        return self.bucket.connection.generate_url(expires_in, method,
110
 
                                                   path, headers)
 
111
                                                   path, headers, query_auth)
111
112
    
112
113
    def send_file(self, fp, headers=None, cb=None, num_cb=10):
113
114
        http_conn = self.bucket.connection.connection
165
166
            response = http_conn.getresponse()
166
167
            body = response.read()
167
168
            self.bucket.connection.set_debug(save_debug)
168
 
        except socket.error, e:
 
169
        except socket.error, (value, message):
 
170
            if value in self.bucket.connection.socket_exception_values:
 
171
                print 'Caught %d:%s socket error, aborting' % (value, message)
 
172
                raise
169
173
            print 'Caught a socket error, trying to recover'
170
174
            self.bucket.connection.make_http_connection()
171
175
            fp.seek(0)