1
=== modified file 'txaws/storage/client.py'
2
--- txaws/storage/client.py	2009-04-27 08:53:11 +0000
3
+++ txaws/storage/client.py	2009-08-17 12:49:40 +0000
4
@@ -7,111 +7,107 @@
5
7
functionality in this wrapper.
7
functionality in this wrapper.
6
8
"""
8
"""
7
9
9
8
10
9
11
from hashlib import md5
10
from hashlib import md5
10
12
from base64 import b64encode
11
from base64 import b64encode
11
13
12
12
14
13
15
from epsilon.extime import Time
13
from epsilon.extime import Time
14
16
14
15
17
from twisted.web.client import getPage
15
from twisted.web.client import getPage
16
18
from twisted.web.http import datetimeToString
16
from twisted.web.http import datetimeToString
17
19
17
18
18
from txaws.util import XML, calculate_md5
19
20
from txaws.credentials import AWSCredentials
19
from txaws.credentials import AWSCredentials
26
21
from txaws.util import XML
20
27
22
21
28
23
22
NS = '{http://s3.amazonaws.com/doc/2006-03-01/}'
23
24
def calculateMD5(data):
24
25
    digest = md5(data).digest()
25
26
    return b64encode(digest)
29
27
23
30
28
24
31
29
class S3Request(object):
25
class S3Request(object):
35
30
    def __init__(self, verb, bucket=None, objectName=None, data='',
26
36
31
            contentType=None, metadata={}, rootURI='https://s3.amazonaws.com',
27
    def __init__(
37
32
            creds=None):
28
        self, verb, bucket=None, object_name=None, data='', content_type=None,
38
29
        metadata={}, root_uri='https://s3.amazonaws.com',  creds=None):
39
33
        self.verb = verb
30
        self.verb = verb
40
34
        self.bucket = bucket
31
        self.bucket = bucket
42
35
        self.objectName = objectName
32
        self.object_name = object_name
43
36
        self.data = data
33
        self.data = data
45
37
        self.contentType = contentType
34
        self.content_type = content_type
46
38
        self.metadata = metadata
35
        self.metadata = metadata
48
39
        self.rootURI = rootURI
36
        self.root_uri = root_uri
49
40
        self.creds = creds
37
        self.creds = creds
50
41
        self.date = datetimeToString()
38
        self.date = datetimeToString()
51
42
39
53
43
    def getURIPath(self):
40
    def get_uri_path(self):
54
44
        path = '/'
41
        path = '/'
55
45
        if self.bucket is not None:
42
        if self.bucket is not None:
56
46
            path += self.bucket
43
            path += self.bucket
59
47
            if self.objectName is not None:
44
            if self.object_name is not None:
60
48
                path += '/' + self.objectName
45
                path += '/' + self.object_name
61
49
        return path
46
        return path
62
50
47
65
51
    def getURI(self):
48
    def get_uri(self):
66
52
        return self.rootURI + self.getURIPath()
49
        return self.root_uri + self.get_uri_path()
67
53
50
69
54
    def getHeaders(self):
51
    def get_headers(self):
70
55
        headers = {'Content-Length': len(self.data),
52
        headers = {'Content-Length': len(self.data),
72
56
                   'Content-MD5': calculateMD5(self.data),
53
                   'Content-MD5': calculate_md5(self.data),
73
57
                   'Date': self.date}
54
                   'Date': self.date}
74
58
55
75
59
        for key, value in self.metadata.iteritems():
56
        for key, value in self.metadata.iteritems():
76
60
            headers['x-amz-meta-' + key] = value
57
            headers['x-amz-meta-' + key] = value
77
61
58
80
62
        if self.contentType is not None:
59
        if self.content_type is not None:
81
63
            headers['Content-Type'] = self.contentType
60
            headers['Content-Type'] = self.content_type
82
64
61
83
65
        if self.creds is not None:
62
        if self.creds is not None:
85
66
            signature = self.getSignature(headers)
63
            signature = self.get_signature(headers)
86
67
            headers['Authorization'] = 'AWS %s:%s' % (self.creds.access_key, signature)
64
            headers['Authorization'] = 'AWS %s:%s' % (self.creds.access_key, signature)
87
68
65
88
69
        return headers
66
        return headers
89
70
67
92
71
    def getCanonicalizedResource(self):
68
    def get_canonicalized_resource(self):
93
72
        return self.getURIPath()
69
        return self.get_uri_path()
94
73
70
96
74
    def getCanonicalizedAmzHeaders(self, headers):
71
    def get_canonicalized_amz_headers(self, headers):
97
75
        result = ''
72
        result = ''
98
76
        headers = [(name.lower(), value) for name, value in headers.iteritems() if name.lower().startswith('x-amz-')]
73
        headers = [(name.lower(), value) for name, value in headers.iteritems() if name.lower().startswith('x-amz-')]
99
77
        headers.sort()
74
        headers.sort()
100
78
        return ''.join('%s:%s\n' % (name, value) for name, value in headers)
75
        return ''.join('%s:%s\n' % (name, value) for name, value in headers)
101
79
76
103
80
    def getSignature(self, headers):
77
    def get_signature(self, headers):
104
81
        text = self.verb + '\n'
78
        text = self.verb + '\n'
105
82
        text += headers.get('Content-MD5', '') + '\n'
79
        text += headers.get('Content-MD5', '') + '\n'
106
83
        text += headers.get('Content-Type', '') + '\n'
80
        text += headers.get('Content-Type', '') + '\n'
107
84
        text += headers.get('Date', '') + '\n'
81
        text += headers.get('Date', '') + '\n'
110
85
        text += self.getCanonicalizedAmzHeaders(headers)
82
        text += self.get_canonicalized_amz_headers(headers)
111
86
        text += self.getCanonicalizedResource()
83
        text += self.get_canonicalized_resource()
112
87
        return self.creds.sign(text)
84
        return self.creds.sign(text)
113
88
85
114
89
    def submit(self):
86
    def submit(self):
116
90
        return self.getPage(url=self.getURI(), method=self.verb, postdata=self.data, headers=self.getHeaders())
87
        return self.get_page(url=self.get_uri(), method=self.verb, postdata=self.data, headers=self.get_headers())
117
91
88
119
92
    def getPage(self, *a, **kw):
89
    def get_page(self, *a, **kw):
120
93
        return getPage(*a, **kw)
90
        return getPage(*a, **kw)
121
94
91
122
95
92
123
96
NS = '{http://s3.amazonaws.com/doc/2006-03-01/}'
124
97
125
98
class S3(object):
93
class S3(object):
128
99
    rootURI = 'https://s3.amazonaws.com/'
94
129
100
    requestFactory = S3Request
95
    root_uri = 'https://s3.amazonaws.com/'
130
96
    request_factory = S3Request
131
101
97
132
102
    def __init__(self, creds):
98
    def __init__(self, creds):
133
103
        self.creds = creds
99
        self.creds = creds
134
104
100
136
105
    def makeRequest(self, *a, **kw):
101
    def make_request(self, *a, **kw):
137
106
        """
102
        """
138
107
        Create a request with the arguments passed in.
103
        Create a request with the arguments passed in.
139
108
104
141
109
        This uses the requestFactory attribute, adding the credentials to the
105
        This uses the request_factory attribute, adding the credentials to the
142
110
        arguments passed in.
106
        arguments passed in.
143
111
        """
107
        """
145
112
        return self.requestFactory(creds=self.creds, *a, **kw)
108
        return self.request_factory(creds=self.creds, *a, **kw)
146
113
109
148
114
    def _parseBucketList(self, response):
110
    def _parse_bucket_list(self, response):
149
115
        """
111
        """
150
116
        Parse XML bucket list response.
112
        Parse XML bucket list response.
151
117
        """
113
        """
152
@@ -120,57 +116,57 @@
153
120
            yield {'name': bucket.findtext(NS + 'Name'),
116
            yield {'name': bucket.findtext(NS + 'Name'),
154
121
                   'created': Time.fromISO8601TimeAndDate(bucket.findtext(NS + 'CreationDate'))}
117
                   'created': Time.fromISO8601TimeAndDate(bucket.findtext(NS + 'CreationDate'))}
155
122
118
157
123
    def listBuckets(self):
119
    def list_buckets(self):
158
124
        """
120
        """
159
125
        List all buckets.
121
        List all buckets.
160
126
122
161
127
        Returns a list of all the buckets owned by the authenticated sender of
123
        Returns a list of all the buckets owned by the authenticated sender of
162
128
        the request.
124
        the request.
163
129
        """
125
        """
165
130
        return self.makeRequest('GET').submit().addCallback(self._parseBucketList)
126
        return self.make_request('GET').submit().addCallback(self._parse_bucket_list)
166
131
127
168
132
    def createBucket(self, bucket):
128
    def create_bucket(self, bucket):
169
133
        """
129
        """
170
134
        Create a new bucket.
130
        Create a new bucket.
171
135
        """
131
        """
173
136
        return self.makeRequest('PUT', bucket).submit()
132
        return self.make_request('PUT', bucket).submit()
174
137
133
176
138
    def deleteBucket(self, bucket):
134
    def delete_bucket(self, bucket):
177
139
        """
135
        """
178
140
        Delete a bucket.
136
        Delete a bucket.
179
141
137
180
142
        The bucket must be empty before it can be deleted.
138
        The bucket must be empty before it can be deleted.
181
143
        """
139
        """
183
144
        return self.makeRequest('DELETE', bucket).submit()
140
        return self.make_request('DELETE', bucket).submit()
184
145
141
186
146
    def putObject(self, bucket, objectName, data, contentType=None, metadata={}):
142
    def put_object(self, bucket, object_name, data, content_type=None, metadata={}):
187
147
        """
143
        """
188
148
        Put an object in a bucket.
144
        Put an object in a bucket.
189
149
145
190
150
        Any existing object of the same name will be replaced.
146
        Any existing object of the same name will be replaced.
191
151
        """
147
        """
193
152
        return self.makeRequest('PUT', bucket, objectName, data, contentType, metadata).submit()
148
        return self.make_request('PUT', bucket, object_name, data, content_type, metadata).submit()
194
153
149
196
154
    def getObject(self, bucket, objectName):
150
    def get_object(self, bucket, object_name):
197
155
        """
151
        """
198
156
        Get an object from a bucket.
152
        Get an object from a bucket.
199
157
        """
153
        """
201
158
        return self.makeRequest('GET', bucket, objectName).submit()
154
        return self.make_request('GET', bucket, object_name).submit()
202
159
155
204
160
    def headObject(self, bucket, objectName):
156
    def head_object(self, bucket, object_name):
205
161
        """
157
        """
206
162
        Retrieve object metadata only.
158
        Retrieve object metadata only.
207
163
159
209
164
        This is like getObject, but the object's content is not retrieved.
160
        This is like get_object, but the object's content is not retrieved.
210
165
        Currently the metadata is not returned to the caller either, so this
161
        Currently the metadata is not returned to the caller either, so this
211
166
        method is mostly useless, and only provided for completeness.
162
        method is mostly useless, and only provided for completeness.
212
167
        """
163
        """
214
168
        return self.makeRequest('HEAD', bucket, objectName).submit()
164
        return self.make_request('HEAD', bucket, object_name).submit()
215
169
165
217
170
    def deleteObject(self, bucket, objectName):
166
    def delete_object(self, bucket, object_name):
218
171
        """
167
        """
219
172
        Delete an object from a bucket.
168
        Delete an object from a bucket.
220
173
169
221
174
        Once deleted, there is no method to restore or undelete an object.
170
        Once deleted, there is no method to restore or undelete an object.
222
175
        """
171
        """
224
176
        return self.makeRequest('DELETE', bucket, objectName).submit()
172
        return self.make_request('DELETE', bucket, object_name).submit()
225
177
173
226
=== modified file 'txaws/storage/test/test_client.py'
227
--- txaws/storage/test/test_client.py	2009-04-26 08:32:36 +0000
228
+++ txaws/storage/test/test_client.py	2009-08-17 12:49:40 +0000
229
@@ -4,17 +4,21 @@
230
4
4
231
5
from twisted.internet.defer import succeed
5
from twisted.internet.defer import succeed
232
6
6
233
7
from txaws.util import calculate_md5
234
8
from txaws.tests import TXAWSTestCase
235
7
from txaws.credentials import AWSCredentials
9
from txaws.credentials import AWSCredentials
238
8
from txaws.tests import TXAWSTestCase
10
from txaws.storage.client import S3, S3Request
239
9
from txaws.storage.client import S3, S3Request, calculateMD5
11
240
10
12
241
11
class StubbedS3Request(S3Request):
13
class StubbedS3Request(S3Request):
243
12
    def getPage(self, url, method, postdata, headers):
14
244
15
    def get_page(self, url, method, postdata, headers):
245
13
        self.getPageArgs = (url, method, postdata, headers)
16
        self.getPageArgs = (url, method, postdata, headers)
246
14
        return succeed('')
17
        return succeed('')
247
15
18
248
16
19
249
17
class RequestTests(TXAWSTestCase):
20
class RequestTests(TXAWSTestCase):
250
21
251
18
    creds = AWSCredentials(access_key='0PN5J17HBGZHT7JJ3X82',
22
    creds = AWSCredentials(access_key='0PN5J17HBGZHT7JJ3X82',
252
19
        secret_key='uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o')
23
        secret_key='uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o')
253
20
24
254
@@ -25,10 +29,10 @@
255
25
        DATA = 'objectData'
29
        DATA = 'objectData'
256
26
        DIGEST = 'zhdB6gwvocWv/ourYUWMxA=='
30
        DIGEST = 'zhdB6gwvocWv/ourYUWMxA=='
257
27
31
259
28
        request = S3Request('PUT', 'somebucket', 'object/name/here', DATA, contentType='text/plain', metadata={'foo': 'bar'})
32
        request = S3Request('PUT', 'somebucket', 'object/name/here', DATA, content_type='text/plain', metadata={'foo': 'bar'})
260
29
        self.assertEqual(request.verb, 'PUT')
33
        self.assertEqual(request.verb, 'PUT')
263
30
        self.assertEqual(request.getURI(), 'https://s3.amazonaws.com/somebucket/object/name/here')
34
        self.assertEqual(request.get_uri(), 'https://s3.amazonaws.com/somebucket/object/name/here')
264
31
        headers = request.getHeaders()
35
        headers = request.get_headers()
265
32
        self.assertNotEqual(headers.pop('Date'), '')
36
        self.assertNotEqual(headers.pop('Date'), '')
266
33
        self.assertEqual(headers,
37
        self.assertEqual(headers,
267
34
                         {'Content-Type': 'text/plain',
38
                         {'Content-Type': 'text/plain',
268
@@ -45,8 +49,8 @@
269
45
49
270
46
        request = S3Request('GET', 'somebucket')
50
        request = S3Request('GET', 'somebucket')
271
47
        self.assertEqual(request.verb, 'GET')
51
        self.assertEqual(request.verb, 'GET')
274
48
        self.assertEqual(request.getURI(), 'https://s3.amazonaws.com/somebucket')
52
        self.assertEqual(request.get_uri(), 'https://s3.amazonaws.com/somebucket')
275
49
        headers = request.getHeaders()
53
        headers = request.get_headers()
276
50
        self.assertNotEqual(headers.pop('Date'), '')
54
        self.assertNotEqual(headers.pop('Date'), '')
277
51
        self.assertEqual(headers,
55
        self.assertEqual(headers,
278
52
                         {'Content-Length': 0,
56
                         {'Content-Length': 0,
279
@@ -63,10 +67,10 @@
280
63
            self.assertEqual(result, '')
67
            self.assertEqual(result, '')
281
64
68
282
65
            url, method, postdata, headers = request.getPageArgs
69
            url, method, postdata, headers = request.getPageArgs
284
66
            self.assertEqual(url, request.getURI())
70
            self.assertEqual(url, request.get_uri())
285
67
            self.assertEqual(method, request.verb)
71
            self.assertEqual(method, request.verb)
286
68
            self.assertEqual(postdata, request.data)
72
            self.assertEqual(postdata, request.data)
288
69
            self.assertEqual(headers, request.getHeaders())
73
            self.assertEqual(headers, request.get_headers())
289
70
74
290
71
        return request.submit().addCallback(_postCheck)
75
        return request.submit().addCallback(_postCheck)
291
72
76
292
@@ -74,7 +78,7 @@
293
74
        req = S3Request('GET', creds=self.creds)
78
        req = S3Request('GET', creds=self.creds)
294
75
        req.date = 'Wed, 28 Mar 2007 01:29:59 +0000'
79
        req.date = 'Wed, 28 Mar 2007 01:29:59 +0000'
295
76
80
297
77
        headers = req.getHeaders()
81
        headers = req.get_headers()
298
78
        self.assertEqual(headers['Authorization'], 'AWS 0PN5J17HBGZHT7JJ3X82:jF7L3z/FTV47vagZzhKupJ9oNig=')
82
        self.assertEqual(headers['Authorization'], 'AWS 0PN5J17HBGZHT7JJ3X82:jF7L3z/FTV47vagZzhKupJ9oNig=')
299
79
83
300
80
84
301
@@ -102,13 +106,13 @@
302
102
    """
106
    """
303
103
    Testable version of S3.
107
    Testable version of S3.
304
104
108
306
105
    This subclass stubs requestFactory to use InertRequest, making it easy to
109
    This subclass stubs request_factory to use InertRequest, making it easy to
307
106
    assert things about the requests that are created in response to various
110
    assert things about the requests that are created in response to various
308
107
    operations.
111
    operations.
309
108
    """
112
    """
310
109
    response = None
113
    response = None
311
110
114
313
111
    def requestFactory(self, *a, **kw):
115
    def request_factory(self, *a, **kw):
314
112
        req = InertRequest(response=self.response, *a, **kw)
116
        req = InertRequest(response=self.response, *a, **kw)
315
113
        self._lastRequest = req
117
        self._lastRequest = req
316
114
        return req
118
        return req
317
@@ -143,9 +147,9 @@
318
143
        self.creds = AWSCredentials(access_key='accessKey', secret_key='secretKey')
147
        self.creds = AWSCredentials(access_key='accessKey', secret_key='secretKey')
319
144
        self.s3 = TestableS3(creds=self.creds)
148
        self.s3 = TestableS3(creds=self.creds)
320
145
149
322
146
    def test_makeRequest(self):
150
    def test_make_request(self):
323
147
        """
151
        """
325
148
        Test that makeRequest passes in the service credentials.
152
        Test that make_request passes in the service credentials.
326
149
        """
153
        """
327
150
        marker = object()
154
        marker = object()
328
151
155
329
@@ -153,79 +157,79 @@
330
153
            self.assertEqual(kw['creds'], self.creds)
157
            self.assertEqual(kw['creds'], self.creds)
331
154
            return marker
158
            return marker
332
155
159
335
156
        self.s3.requestFactory = _cb
160
        self.s3.request_factory = _cb
336
157
        self.assertIdentical(self.s3.makeRequest('GET'), marker)
161
        self.assertIdentical(self.s3.make_request('GET'), marker)
337
158
162
339
159
    def test_listBuckets(self):
163
    def test_list_buckets(self):
340
160
        self.s3.response = samples['ListAllMyBucketsResult']
164
        self.s3.response = samples['ListAllMyBucketsResult']
342
161
        d = self.s3.listBuckets()
165
        d = self.s3.list_buckets()
343
162
166
344
163
        req = self.s3._lastRequest
167
        req = self.s3._lastRequest
345
164
        self.assertTrue(req.submitted)
168
        self.assertTrue(req.submitted)
346
165
        self.assertEqual(req.verb, 'GET')
169
        self.assertEqual(req.verb, 'GET')
347
166
        self.assertEqual(req.bucket, None)
170
        self.assertEqual(req.bucket, None)
349
167
        self.assertEqual(req.objectName, None)
171
        self.assertEqual(req.object_name, None)
350
168
172
352
169
        def _checkResult(buckets):
173
        def _check_result(buckets):
353
170
            self.assertEqual(list(buckets),
174
            self.assertEqual(list(buckets),
354
171
                             [{'name': u'quotes',
175
                             [{'name': u'quotes',
355
172
                               'created': Time.fromDatetime(datetime(2006, 2, 3, 16, 45, 9))},
176
                               'created': Time.fromDatetime(datetime(2006, 2, 3, 16, 45, 9))},
356
173
                              {'name': u'samples',
177
                              {'name': u'samples',
357
174
                               'created': Time.fromDatetime(datetime(2006, 2, 3, 16, 41, 58))}])
178
                               'created': Time.fromDatetime(datetime(2006, 2, 3, 16, 41, 58))}])
359
175
        return d.addCallback(_checkResult)
179
        return d.addCallback(_check_result)
360
176
180
363
177
    def test_createBucket(self):
181
    def test_create_bucket(self):
364
178
        self.s3.createBucket('foo')
182
        self.s3.create_bucket('foo')
365
179
        req = self.s3._lastRequest
183
        req = self.s3._lastRequest
366
180
        self.assertTrue(req.submitted)
184
        self.assertTrue(req.submitted)
367
181
        self.assertEqual(req.verb, 'PUT')
185
        self.assertEqual(req.verb, 'PUT')
368
182
        self.assertEqual(req.bucket, 'foo')
186
        self.assertEqual(req.bucket, 'foo')
370
183
        self.assertEqual(req.objectName, None)
187
        self.assertEqual(req.object_name, None)
371
184
188
374
185
    def test_deleteBucket(self):
189
    def test_delete_bucket(self):
375
186
        self.s3.deleteBucket('foo')
190
        self.s3.delete_bucket('foo')
376
187
        req = self.s3._lastRequest
191
        req = self.s3._lastRequest
377
188
        self.assertTrue(req.submitted)
192
        self.assertTrue(req.submitted)
378
189
        self.assertEqual(req.verb, 'DELETE')
193
        self.assertEqual(req.verb, 'DELETE')
379
190
        self.assertEqual(req.bucket, 'foo')
194
        self.assertEqual(req.bucket, 'foo')
381
191
        self.assertEqual(req.objectName, None)
195
        self.assertEqual(req.object_name, None)
382
192
196
385
193
    def test_putObject(self):
197
    def test_put_object(self):
386
194
        self.s3.putObject('foobucket', 'foo', 'data', 'text/plain', {'foo': 'bar'})
198
        self.s3.put_object('foobucket', 'foo', 'data', 'text/plain', {'foo': 'bar'})
387
195
        req = self.s3._lastRequest
199
        req = self.s3._lastRequest
388
196
        self.assertTrue(req.submitted)
200
        self.assertTrue(req.submitted)
389
197
        self.assertEqual(req.verb, 'PUT')
201
        self.assertEqual(req.verb, 'PUT')
390
198
        self.assertEqual(req.bucket, 'foobucket')
202
        self.assertEqual(req.bucket, 'foobucket')
392
199
        self.assertEqual(req.objectName, 'foo')
203
        self.assertEqual(req.object_name, 'foo')
393
200
        self.assertEqual(req.data, 'data')
204
        self.assertEqual(req.data, 'data')
395
201
        self.assertEqual(req.contentType, 'text/plain')
205
        self.assertEqual(req.content_type, 'text/plain')
396
202
        self.assertEqual(req.metadata, {'foo': 'bar'})
206
        self.assertEqual(req.metadata, {'foo': 'bar'})
397
203
207
400
204
    def test_getObject(self):
208
    def test_get_object(self):
401
205
        self.s3.getObject('foobucket', 'foo')
209
        self.s3.get_object('foobucket', 'foo')
402
206
        req = self.s3._lastRequest
210
        req = self.s3._lastRequest
403
207
        self.assertTrue(req.submitted)
211
        self.assertTrue(req.submitted)
404
208
        self.assertEqual(req.verb, 'GET')
212
        self.assertEqual(req.verb, 'GET')
405
209
        self.assertEqual(req.bucket, 'foobucket')
213
        self.assertEqual(req.bucket, 'foobucket')
407
210
        self.assertEqual(req.objectName, 'foo')
214
        self.assertEqual(req.object_name, 'foo')
408
211
215
411
212
    def test_headObject(self):
216
    def test_head_object(self):
412
213
        self.s3.headObject('foobucket', 'foo')
217
        self.s3.head_object('foobucket', 'foo')
413
214
        req = self.s3._lastRequest
218
        req = self.s3._lastRequest
414
215
        self.assertTrue(req.submitted)
219
        self.assertTrue(req.submitted)
415
216
        self.assertEqual(req.verb, 'HEAD')
220
        self.assertEqual(req.verb, 'HEAD')
416
217
        self.assertEqual(req.bucket, 'foobucket')
221
        self.assertEqual(req.bucket, 'foobucket')
418
218
        self.assertEqual(req.objectName, 'foo')
222
        self.assertEqual(req.object_name, 'foo')
419
219
223
422
220
    def test_deleteObject(self):
224
    def test_delete_object(self):
423
221
        self.s3.deleteObject('foobucket', 'foo')
225
        self.s3.delete_object('foobucket', 'foo')
424
222
        req = self.s3._lastRequest
226
        req = self.s3._lastRequest
425
223
        self.assertTrue(req.submitted)
227
        self.assertTrue(req.submitted)
426
224
        self.assertEqual(req.verb, 'DELETE')
228
        self.assertEqual(req.verb, 'DELETE')
427
225
        self.assertEqual(req.bucket, 'foobucket')
229
        self.assertEqual(req.bucket, 'foobucket')
429
226
        self.assertEqual(req.objectName, 'foo')
230
        self.assertEqual(req.object_name, 'foo')
430
227
231
431
228
232
432
229
class MiscellaneousTests(TXAWSTestCase):
233
class MiscellaneousTests(TXAWSTestCase):
433
230
    def test_contentMD5(self):
234
    def test_contentMD5(self):
435
231
        self.assertEqual(calculateMD5('somedata'), 'rvr3UC1SmUw7AZV2NqPN0g==')
235
        self.assertEqual(calculate_md5('somedata'), 'rvr3UC1SmUw7AZV2NqPN0g==')
436
232
236
437
=== modified file 'txaws/util.py'
438
--- txaws/util.py	2009-04-27 08:53:11 +0000
439
+++ txaws/util.py	2009-08-17 12:49:40 +0000
440
@@ -6,16 +6,23 @@
441
6
6
442
7
__all__ = ['hmac_sha1', 'iso8601time']
7
__all__ = ['hmac_sha1', 'iso8601time']
443
8
8
444
9
import time
445
10
import hmac
446
11
from hashlib import sha1, md5
447
9
from base64 import b64encode
12
from base64 import b64encode
451
10
from hashlib import sha1
13
449
11
import hmac
450
12
import time
452
13
# Import XML from somwhere; here in one place to prevent duplication.
14
# Import XML from somwhere; here in one place to prevent duplication.
453
14
try:
15
try:
454
15
    from xml.etree.ElementTree import XML
16
    from xml.etree.ElementTree import XML
455
16
except ImportError:
17
except ImportError:
456
17
    from elementtree.ElementTree import XML
18
    from elementtree.ElementTree import XML
457
18
19
458
20
459
21
def calculate_md5(data):
460
22
    digest = md5(data).digest()
461
23
    return b64encode(digest)
462
24
463
25
464
19
def hmac_sha1(secret, data):
26
def hmac_sha1(secret, data):
465
20
    digest = hmac.new(secret, data, sha1).digest()
27
    digest = hmac.new(secret, data, sha1).digest()
466
21
    return b64encode(digest)
28
    return b64encode(digest)
Reviewer	Date Requested	Status
Robert Collins (community)	2009-08-17	Needs Fixing on 2009-08-18
Jamu Kakar	2009-08-20	Pending
Thomas Herve	2009-08-19	Pending
Review via email: mp+10245@code.launchpad.net