Merge lp:~oubiwann/txaws/920227-fix-pep8-pyflakes-errors into lp:txaws

Proposed by Duncan McGreggor on 2012-01-23
Status: Merged
Approved by: Duncan McGreggor on 2012-01-24
Approved revision: 122
Merged at revision: 115
Proposed branch: lp:~oubiwann/txaws/920227-fix-pep8-pyflakes-errors
Merge into: lp:txaws
Diff against target: 475 lines (+75/-50)
21 files modified
txaws/client/discover/command.py (+2/-1)
txaws/client/gui/gtk.py (+2/-1)
txaws/client/gui/tests/test_gtk.py (+0/-1)
txaws/ec2/exception.py (+0/-3)
txaws/ec2/tests/test_client.py (+4/-2)
txaws/ec2/tests/test_model.py (+6/-6)
txaws/exception.py (+0/-1)
txaws/meta.py (+0/-1)
txaws/reactor.py (+1/-0)
txaws/s3/client.py (+2/-1)
txaws/s3/tests/test_acls.py (+4/-2)
txaws/s3/tests/test_client.py (+2/-2)
txaws/server/tests/fixtures/amodule.py (+1/-0)
txaws/server/tests/fixtures/importerror/amodule.py (+2/-1)
txaws/server/tests/test_exception.py (+1/-1)
txaws/server/tests/test_registry.py (+1/-0)
txaws/server/tests/test_schema.py (+1/-1)
txaws/testing/base.py (+0/-1)
txaws/testing/payload.py (+43/-22)
txaws/tests/__init__.py (+0/-1)
txaws/tests/test_util.py (+3/-2)
To merge this branch: bzr merge lp:~oubiwann/txaws/920227-fix-pep8-pyflakes-errors
Reviewer Review Type Date Requested Status
Thomas Herve 2012-01-23 Approve on 2012-01-24
Review via email: mp+89619@code.launchpad.net
To post a comment you must log in.
Thomas Herve (therve) wrote :

Cool, +1!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'txaws/client/discover/command.py'
2--- txaws/client/discover/command.py 2011-09-30 14:35:08 +0000
3+++ txaws/client/discover/command.py 2012-01-23 01:30:30 +0000
4@@ -72,7 +72,8 @@
5 print >> self.output, "URL: %s" % query.client.url
6 print >> self.output
7 if getattr(query.client, "status", None) is not None:
8- print >> self.output, "HTTP status code: %s" % query.client.status
9+ print >> self.output, "HTTP status code: %s" % (
10+ query.client.status,)
11 print >> self.output
12 print >> self.output, message
13
14
15=== modified file 'txaws/client/gui/gtk.py'
16--- txaws/client/gui/gtk.py 2010-02-12 23:12:17 +0000
17+++ txaws/client/gui/gtk.py 2012-01-23 01:30:30 +0000
18@@ -63,7 +63,7 @@
19
20 def set_region(self, creds):
21 from txaws.service import AWSServiceRegion
22- self.region = AWSServiceRegion(creds)
23+ self.region = AWSServiceRegion(creds)
24
25 def create_client(self, creds):
26 if creds is not None:
27@@ -98,6 +98,7 @@
28 gtk.STOCK_CANCEL,
29 gtk.RESPONSE_REJECT))
30 content = self.password_dialog.get_content_area()
31+
32 def add_entry(name):
33 box = gtk.HBox()
34 box.show()
35
36=== modified file 'txaws/client/gui/tests/test_gtk.py'
37--- txaws/client/gui/tests/test_gtk.py 2009-04-26 08:32:36 +0000
38+++ txaws/client/gui/tests/test_gtk.py 2012-01-23 01:30:30 +0000
39@@ -8,4 +8,3 @@
40
41 pass
42 # Really need some, but UI testing hurts my brain.
43-
44
45=== modified file 'txaws/ec2/exception.py'
46--- txaws/ec2/exception.py 2011-04-21 13:10:37 +0000
47+++ txaws/ec2/exception.py 2012-01-23 01:30:30 +0000
48@@ -15,6 +15,3 @@
49 data = self._node_to_dict(error)
50 if data:
51 self.errors.append(data)
52-
53-
54-
55
56=== modified file 'txaws/ec2/tests/test_client.py'
57--- txaws/ec2/tests/test_client.py 2011-08-29 19:51:50 +0000
58+++ txaws/ec2/tests/test_client.py 2012-01-23 01:30:30 +0000
59@@ -139,7 +139,8 @@
60
61 def submit(self):
62 return succeed(
63- payload.sample_describe_availability_zones_multiple_results)
64+ payload.
65+ sample_describe_availability_zones_multiple_results)
66
67 def check_parsed_availability_zones(results):
68 self.assertEquals(len(results), 3)
69@@ -1751,7 +1752,8 @@
70 "&SignatureVersion=2&"
71 "Timestamp=2007-11-12T13%3A14%3A15Z&Version=2008-12-01&"
72 "argwithnovalue=&fu%20n=g%2Fames")
73- self.assertEqual(expected_params, signature.get_canonical_query_params())
74+ self.assertEqual(
75+ expected_params, signature.get_canonical_query_params())
76
77 def test_signing_text(self):
78 signature = client.Signature(self.creds, self.endpoint, self.params)
79
80=== modified file 'txaws/ec2/tests/test_model.py'
81--- txaws/ec2/tests/test_model.py 2009-09-15 21:15:19 +0000
82+++ txaws/ec2/tests/test_model.py 2012-01-23 01:30:30 +0000
83@@ -28,12 +28,12 @@
84 "name", "desc", owner_id="me", groups=user_group_pairs, ips=ips)
85 self.assertEquals(group.name, "name")
86 self.assertEquals(group.description, "desc")
87- self.assertEquals(group.owner_id, "me")
88- self.assertEquals(group.allowed_groups[0].user_id, "somegal24")
89- self.assertEquals(group.allowed_groups[0].group_name, "other1")
90- self.assertEquals(group.allowed_groups[1].user_id, "somegal24")
91- self.assertEquals(group.allowed_groups[1].group_name, "other2")
92- self.assertEquals(group.allowed_ips[0].cidr_ip, "10.0.1.0/24")
93+ self.assertEquals(group.owner_id, "me")
94+ self.assertEquals(group.allowed_groups[0].user_id, "somegal24")
95+ self.assertEquals(group.allowed_groups[0].group_name, "other1")
96+ self.assertEquals(group.allowed_groups[1].user_id, "somegal24")
97+ self.assertEquals(group.allowed_groups[1].group_name, "other2")
98+ self.assertEquals(group.allowed_ips[0].cidr_ip, "10.0.1.0/24")
99
100
101 class UserIDGroupPairTestCase(TXAWSTestCase):
102
103=== modified file 'txaws/exception.py'
104--- txaws/exception.py 2010-03-29 17:16:46 +0000
105+++ txaws/exception.py 2012-01-23 01:30:30 +0000
106@@ -122,7 +122,6 @@
107 return self.errors[0]["Message"]
108
109
110-
111 class AWSResponseParseError(Exception):
112 """
113 txAWS was unable to parse the server response.
114
115=== modified file 'txaws/meta.py'
116--- txaws/meta.py 2009-12-08 04:08:53 +0000
117+++ txaws/meta.py 2012-01-23 01:30:30 +0000
118@@ -7,4 +7,3 @@
119 description = """
120 Twisted-based Asynchronous Libraries for Amazon Web Services
121 """
122-
123
124=== modified file 'txaws/reactor.py'
125--- txaws/reactor.py 2010-01-13 19:56:00 +0000
126+++ txaws/reactor.py 2012-01-23 01:30:30 +0000
127@@ -1,5 +1,6 @@
128 '''Reactor utilities.'''
129
130+
131 def get_exitcode_reactor():
132 """
133 This is only neccesary until a fix like the one outlined here is
134
135=== modified file 'txaws/s3/client.py'
136--- txaws/s3/client.py 2012-01-06 00:00:22 +0000
137+++ txaws/s3/client.py 2012-01-23 01:30:30 +0000
138@@ -61,7 +61,8 @@
139 def get_url(self):
140 if self.endpoint.port is not None:
141 return "%s://%s:%d%s" % (
142- self.endpoint.scheme, self.get_host(), self.endpoint.port, self.get_path())
143+ self.endpoint.scheme, self.get_host(), self.endpoint.port,
144+ self.get_path())
145 else:
146 return "%s://%s%s" % (
147 self.endpoint.scheme, self.get_host(), self.get_path())
148
149=== modified file 'txaws/s3/tests/test_acls.py'
150--- txaws/s3/tests/test_acls.py 2011-03-26 12:50:41 +0000
151+++ txaws/s3/tests/test_acls.py 2012-01-23 01:30:30 +0000
152@@ -22,7 +22,8 @@
153 display_name='BucketOwnersEmail@amazon.com')
154 xml_bytes = grantee.to_xml()
155 self.assertEquals(xml_bytes, """\
156-<Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser">
157+<Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\
158+ xsi:type="CanonicalUser">
159 <ID>8a6925ce4adf588a4f21c32aa379004fef</ID>
160 <DisplayName>BucketOwnersEmail@amazon.com</DisplayName>
161 </Grantee>
162@@ -35,7 +36,8 @@
163 xml_bytes = grant.to_xml()
164 self.assertEquals(xml_bytes, """\
165 <Grant>
166- <Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser">
167+ <Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\
168+ xsi:type="CanonicalUser">
169 <ID>8a6925ce4adf588a4f21c32aa379004fef</ID>
170 <DisplayName>BucketOwnersEmail@amazon.com</DisplayName>
171 </Grantee>
172
173=== modified file 'txaws/s3/tests/test_client.py'
174--- txaws/s3/tests/test_client.py 2012-01-06 09:51:07 +0000
175+++ txaws/s3/tests/test_client.py 2012-01-23 01:30:30 +0000
176@@ -63,7 +63,7 @@
177 "http://localhost/mydocs/notes.txt")
178
179 def test_custom_port_endpoint(self):
180- test_uri='http://0.0.0.0:12345/'
181+ test_uri = 'http://0.0.0.0:12345/'
182 endpoint = AWSServiceEndpoint(uri=test_uri)
183 self.assertEquals(endpoint.port, 12345)
184 self.assertEquals(endpoint.scheme, 'http')
185@@ -74,7 +74,7 @@
186 self.assertEquals(context.get_url(), test_uri + 'foo/bar')
187
188 def test_custom_port_endpoint_https(self):
189- test_uri='https://0.0.0.0:12345/'
190+ test_uri = 'https://0.0.0.0:12345/'
191 endpoint = AWSServiceEndpoint(uri=test_uri)
192 self.assertEquals(endpoint.port, 12345)
193 self.assertEquals(endpoint.scheme, 'https')
194
195=== modified file 'txaws/server/tests/fixtures/amodule.py'
196--- txaws/server/tests/fixtures/amodule.py 2011-08-28 20:45:42 +0000
197+++ txaws/server/tests/fixtures/amodule.py 2012-01-23 01:30:30 +0000
198@@ -1,6 +1,7 @@
199 from txaws.server.tests.fixtures import method
200 from txaws.server.method import Method
201
202+
203 @method
204 class TestMethod(Method):
205 pass
206
207=== modified file 'txaws/server/tests/fixtures/importerror/amodule.py'
208--- txaws/server/tests/fixtures/importerror/amodule.py 2011-08-28 20:45:42 +0000
209+++ txaws/server/tests/fixtures/importerror/amodule.py 2012-01-23 01:30:30 +0000
210@@ -1,5 +1,6 @@
211 from txaws.server.method import Method
212-from txaws.server.tests.fixtures import method
213+from txaws.server.tests.fixtures import method
214+
215
216 @method
217 class TestMethod(Method):
218
219=== modified file 'txaws/server/tests/test_exception.py'
220--- txaws/server/tests/test_exception.py 2011-12-01 14:19:12 +0000
221+++ txaws/server/tests/test_exception.py 2012-01-23 01:30:30 +0000
222@@ -54,7 +54,7 @@
223
224 def test_with_unicode_message(self):
225 """
226- L{APIError} will convert message to plain ASCII if converted to string.
227+ L{APIError} will convert message to plain ASCII if converted to string.
228 """
229 error = APIError(400, code="APIError", message=u"cittá")
230 self.assertEqual(u"cittá", error.message)
231
232=== modified file 'txaws/server/tests/test_registry.py'
233--- txaws/server/tests/test_registry.py 2011-08-28 20:36:04 +0000
234+++ txaws/server/tests/test_registry.py 2012-01-23 01:30:30 +0000
235@@ -98,6 +98,7 @@
236 deal with scanning errors.
237 """
238 swallowed = []
239+
240 def swallow(error):
241 swallowed.append(error)
242
243
244=== modified file 'txaws/server/tests/test_schema.py'
245--- txaws/server/tests/test_schema.py 2012-01-06 01:01:10 +0000
246+++ txaws/server/tests/test_schema.py 2012-01-23 01:30:30 +0000
247@@ -328,7 +328,7 @@
248 """
249 parameter = Date("Test")
250 date = datetime(2010, 9, 15, 23, 59, 59,
251- tzinfo=tzoffset('UTC', 120*60))
252+ tzinfo=tzoffset('UTC', 120 * 60))
253 self.assertEqual("2010-09-15T21:59:59Z", parameter.format(date))
254
255
256
257=== modified file 'txaws/testing/base.py'
258--- txaws/testing/base.py 2010-06-04 19:00:25 +0000
259+++ txaws/testing/base.py 2012-01-23 01:30:30 +0000
260@@ -24,4 +24,3 @@
261 for key in set(os.environ) - set(self.orig_environ):
262 del os.environ[key]
263 os.environ.update(self.orig_environ)
264-
265
266=== modified file 'txaws/testing/payload.py'
267--- txaws/testing/payload.py 2011-08-29 19:51:50 +0000
268+++ txaws/testing/payload.py 2012-01-23 01:30:30 +0000
269@@ -22,7 +22,8 @@
270 <code>16</code>
271 <name>running</name>
272 </instanceState>
273- <privateDnsName>domU-12-31-39-03-15-11.compute-1.internal</privateDnsName>
274+ <privateDnsName>domU-12-31-39-03-15-11.compute-1.internal\
275+</privateDnsName>
276 <dnsName>ec2-75-101-245-65.compute-1.amazonaws.com</dnsName>
277 <instanceType>c1.xlarge</instanceType>
278 <launchTime>2009-04-27T02:23:18.000Z</launchTime>
279@@ -58,7 +59,8 @@
280 <code>16</code>
281 <name>running</name>
282 </instanceState>
283- <privateDnsName>domU-12-31-39-03-15-11.compute-1.internal</privateDnsName>
284+ <privateDnsName>domU-12-31-39-03-15-11.compute-1.internal\
285+</privateDnsName>
286 <dnsName>ec2-75-101-245-65.compute-1.amazonaws.com</dnsName>
287 <reason/>
288 <keyName>keyname</keyName>
289@@ -494,7 +496,8 @@
290 <Errors>
291 <Error>
292 <Code>InvalidGroup.InUse</Code>
293- <Message>Group groupID1:GroupReferredTo is used by groups: groupID2:UsingGroup</Message>
294+ <Message>Group groupID1:GroupReferredTo is used by groups: \
295+groupID2:UsingGroup</Message>
296 </Error>
297 </Errors>
298 <RequestID>9a6df05f-9c27-47aa-81d8-6619689210cc</RequestID>
299@@ -503,7 +506,8 @@
300
301
302 sample_authorize_security_group = """\
303-<AuthorizeSecurityGroupIngressResponse xmlns="http://ec2.amazonaws.com/doc/%s/">
304+<AuthorizeSecurityGroupIngressResponse\
305+ xmlns="http://ec2.amazonaws.com/doc/%s/">
306 <return>true</return>
307 </AuthorizeSecurityGroupIngressResponse>
308 """ % (version.ec2_api,)
309@@ -650,7 +654,8 @@
310 <keySet>
311 <item>
312 <keyName>gsg-keypair</keyName>
313- <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f</keyFingerprint>
314+ <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:\
315+ca:9f:f5:f1:6f</keyFingerprint>
316 </item>
317 </keySet>
318 </DescribeKeyPairsResponse>
319@@ -663,11 +668,13 @@
320 <keySet>
321 <item>
322 <keyName>gsg-keypair-1</keyName>
323- <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f</keyFingerprint>
324+ <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:\
325+ca:9f:f5:f1:6f</keyFingerprint>
326 </item>
327 <item>
328 <keyName>gsg-keypair-2</keyName>
329- <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:70</keyFingerprint>
330+ <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:\
331+ca:9f:f5:f1:70</keyFingerprint>
332 </item>
333 </keySet>
334 </DescribeKeyPairsResponse>
335@@ -678,7 +685,8 @@
336 <?xml version="1.0"?>
337 <CreateKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/%s/">
338 <keyName>example-key-name</keyName>
339- <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f</keyFingerprint>
340+ <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:\
341+ca:9f:f5:f1:6f</keyFingerprint>
342 <keyMaterial>-----BEGIN RSA PRIVATE KEY-----
343 MIIEoQIBAAKCAQBuLFg5ujHrtm1jnutSuoO8Xe56LlT+HM8v/xkaa39EstM3/aFxTHgElQiJLChp
344 HungXQ29VTc8rc1bW0lkdi23OH5eqkMHGhvEwqa0HWASUMll4o3o/IX+0f2UcPoKCOVUR+jx71Sg
345@@ -747,7 +755,8 @@
346 <?xml version="1.0"?>
347 <ImportKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/%s/">
348 <keyName>example-key-name</keyName>
349- <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f</keyFingerprint>
350+ <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:\
351+ca:9f:f5:f1:6f</keyFingerprint>
352 </ImportKeyPairResponse>
353 """ % (version.ec2_api,)
354
355@@ -837,7 +846,8 @@
356 <Errors>
357 <Error>
358 <Code>InvalidClientTokenId</Code>
359- <Message>The AWS Access Key Id you provided does not exist in our records.</Message>
360+ <Message>The AWS Access Key Id you provided does not exist in our\
361+ records.</Message>
362 </Error>
363 </Errors>
364 <RequestID>47bfd77d-78d6-446d-be0d-f7621795dded</RequestID>
365@@ -865,7 +875,8 @@
366 <Code>InternalError</Code>
367 <Message>We encountered an internal error. Please try again.</Message>
368 <RequestID>A2A7E5395E27DFBB</RequestID>
369- <HostID>f691zulHNsUqonsZkjhILnvWwD3ZnmOM4ObM1wXTc6xuS3GzPmjArp8QC/sGsn6K</HostID>
370+ <HostID>f691zulHNsUqonsZkjhILnvWwD3ZnmOM4ObM1wXTc6xuS3GzPmjArp8QC/sGsn6K\
371+</HostID>
372 </Error>
373 """
374
375@@ -926,7 +937,8 @@
376
377
378 sample_get_bucket_location_result = """\
379-<LocationConstraint xmlns="http://s3.amazonaws.com/doc/2006-03-01/">EU</LocationConstraint>
380+<LocationConstraint xmlns="http://s3.amazonaws.com/doc/2006-03-01/">EU\
381+</LocationConstraint>
382
383 """
384 sample_request_payment = """\
385@@ -940,12 +952,18 @@
386 <?xml version="1.0" encoding="UTF-8"?>
387 <Error>
388 <Code>SignatureDoesNotMatch</Code>
389- <Message>The request signature we calculated does not match the signature you provided. Check your key and signing method.</Message>
390- <StringToSignBytes>47 45 54 0a 31 42 32 4d 32 59 38 41 73 67 54 70 67 41 6d 59 37 50 68 43 66 67 3d 3d 0a 0a 54 68 75 2c 20 30 35 20 4e 6f 76 20 32 30 30 39 20 32 31 3a 33 33 3a 32 39 20 47 4d 54 0a 2f</StringToSignBytes>
391+ <Message>The request signature we calculated does not match the signature\
392+ you provided. Check your key and signing method.</Message>
393+ <StringToSignBytes>47 45 54 0a 31 42 32 4d 32 59 38 41 73 67 54 70 67 41 6d\
394+ 59 37 50 68 43 66 67 3d 3d 0a 0a 54 68 75 2c 20 30 35 20 4e 6f 76 20 32 30\
395+ 30 39 20 32 31 3a 33 33 3a 32 39 20 47 4d 54 0a 2f</StringToSignBytes>
396 <RequestId>AB9216C8640751B2</RequestId>
397- <HostId>sAPBpmFdsOsgUUwtSLsiT6KIwP1mPbmrYY0xUoahzJE263qmABkTaqzGhHddgOq5</HostId>
398- <SignatureProvided>ltowhdrbjaQ8dQc9VS5MxzJfsPJZi0BZHEzJC3r9pzU=</SignatureProvided>
399- <StringToSign>GET\n1B2M2Y8AsgTpgAmY7PhCfg==\n\nThu, 05 Nov 2009 21:33:29 GMT\n/</StringToSign>
400+ <HostId>sAPBpmFdsOsgUUwtSLsiT6KIwP1mPbmrYY0xUoahzJE263qmABkTaqzGhHddgOq5\
401+</HostId>
402+ <SignatureProvided>ltowhdrbjaQ8dQc9VS5MxzJfsPJZi0BZHEzJC3r9pzU=
403+</SignatureProvided>
404+ <StringToSign>GET\n1B2M2Y8AsgTpgAmY7PhCfg==\n\nThu, 05 Nov 2009 21:33:29\
405+ GMT\n/</StringToSign>
406 <AWSAccessKeyId>SOMEKEYID</AWSAccessKeyId>
407 </Error>
408 """
409@@ -955,9 +973,11 @@
410 <?xml version="1.0" encoding="UTF-8"?>
411 <Error>
412 <Code>InvalidAccessKeyId</Code>
413- <Message>The AWS Access Key Id you provided does not exist in our records.</Message>
414+ <Message>The AWS Access Key Id you provided does not exist in our records.\
415+</Message>
416 <RequestId>0223AD81A94821CE</RequestId>
417- <HostId>HAw5g9P1VkN8ztgLKFTK20CY5LmCfTwXcSths1O7UQV6NuJx2P4tmFnpuOsziwOE</HostId>
418+ <HostId>HAw5g9P1VkN8ztgLKFTK20CY5LmCfTwXcSths1O7UQV6NuJx2P4tmFnpuOsziwOE\
419+</HostId>
420 <AWSAccessKeyId>SOMEKEYID</AWSAccessKeyId>
421 </Error>
422 """
423@@ -970,14 +990,16 @@
424 </Owner>
425 <AccessControlList>
426 <Grant>
427- <Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser">
428+ <Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\
429+ xsi:type="CanonicalUser">
430 <ID>8a6925ce4adf588a4f21c32aa379004fef</ID>
431 <DisplayName>foo@example.net</DisplayName>
432 </Grantee>
433 <Permission>FULL_CONTROL</Permission>
434 </Grant>
435 <Grant>
436- <Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser">
437+ <Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\
438+ xsi:type="CanonicalUser">
439 <ID>8a6925ce4adf588a4f21c32aa37900feed</ID>
440 <DisplayName>bar@example.net</DisplayName>
441 </Grantee>
442@@ -985,4 +1007,3 @@
443 </Grant>
444 </AccessControlList>
445 </AccessControlPolicy>"""
446-
447
448=== modified file 'txaws/tests/__init__.py'
449--- txaws/tests/__init__.py 2009-08-28 02:32:44 +0000
450+++ txaws/tests/__init__.py 2012-01-23 01:30:30 +0000
451@@ -1,1 +0,0 @@
452-
453
454=== modified file 'txaws/tests/test_util.py'
455--- txaws/tests/test_util.py 2009-11-19 16:33:05 +0000
456+++ txaws/tests/test_util.py 2012-01-23 01:30:30 +0000
457@@ -4,6 +4,7 @@
458
459 from txaws.util import hmac_sha1, iso8601time, parse
460
461+
462 class MiscellaneousTests(TestCase):
463
464 def test_hmac_sha1(self):
465@@ -20,8 +21,8 @@
466 self.assertEqual(hmac_sha1(key, data), expected)
467
468 def test_iso8601time(self):
469- self.assertEqual("2006-07-07T15:04:56Z", iso8601time((2006,7,7,15,4,56,
470- 0, 0, 0)))
471+ self.assertEqual("2006-07-07T15:04:56Z",
472+ iso8601time((2006, 7, 7, 15, 4, 56, 0, 0, 0)))
473
474
475 class ParseUrlTestCase(TestCase):

Subscribers

People subscribed via source and target branches

to all changes: