Skip to content

Commit 63df495

Browse files
arnaudlimbourgarnaudlimbourg
committed
Update examples syntax and run black
1 parent d9b06ed commit 63df495

5 files changed

Lines changed: 138 additions & 101 deletions

File tree

‎tests/test_assembly.py‎

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,58 @@
88

99
class AssemblyTest(unittest.TestCase):
1010
def setUp(self):
11-
self.transloadit = Transloadit('key', 'secret')
11+
self.transloadit = Transloadit("key", "secret")
1212
self.assembly = self.transloadit.new_assembly()
13-
self.json_response = '{"ok": "ASSEMBLY_COMPLETED", "assembly_id": "abcdef45673"}'
13+
self.json_response = (
14+
'{"ok": "ASSEMBLY_COMPLETED", "assembly_id": "abcdef45673"}'
15+
)
1416

1517
def test_add_file(self):
16-
with open('LICENSE') as fs, open('README.md') as fs_2, open('CHANGELOG.md') as fs_3:
17-
self.assembly.add_file(fs, 'foo_field')
18+
with open("LICENSE") as fs, open("README.md") as fs_2, open(
19+
"CHANGELOG.md"
20+
) as fs_3:
21+
self.assembly.add_file(fs, "foo_field")
1822

19-
self.assertEqual(self.assembly.files['foo_field'], fs)
23+
self.assertEqual(self.assembly.files["foo_field"], fs)
2024

2125
self.assembly.add_file(fs_2)
2226
self.assembly.add_file(fs_3)
2327

24-
self.assertEqual(self.assembly.files['file'], fs_2)
25-
self.assertEqual(self.assembly.files['file_1'], fs_3)
28+
self.assertEqual(self.assembly.files["file"], fs_2)
29+
self.assertEqual(self.assembly.files["file_1"], fs_3)
2630

2731
def test_remove_file(self):
28-
with open('LICENSE') as fs:
29-
self.assembly.add_file(fs, 'foo_field')
32+
with open("LICENSE") as fs:
33+
self.assembly.add_file(fs, "foo_field")
3034

31-
self.assertEqual(self.assembly.files['foo_field'], fs)
35+
self.assertEqual(self.assembly.files["foo_field"], fs)
3236

33-
self.assembly.remove_file('foo_field')
34-
self.assertIsNone(self.assembly.files.get('foo_field'))
37+
self.assembly.remove_file("foo_field")
38+
self.assertIsNone(self.assembly.files.get("foo_field"))
3539

3640
@requests_mock.Mocker()
3741
def test_save(self, mock):
38-
url = '{}/assemblies'.format(self.transloadit.service)
39-
mock.post(url, text=self.json_response,
40-
additional_matcher=request_body_matcher(open('LICENSE').read()))
42+
url = f"{self.transloadit.service}/assemblies"
43+
mock.post(
44+
url,
45+
text=self.json_response,
46+
additional_matcher=request_body_matcher(open("LICENSE").read()),
47+
)
4148

42-
self.assembly.add_file(open('LICENSE'))
49+
self.assembly.add_file(open("LICENSE"))
4350
assembly = self.assembly.create(resumable=False)
44-
self.assertEqual(assembly.data['ok'], "ASSEMBLY_COMPLETED")
45-
self.assertEqual(assembly.data['assembly_id'], "abcdef45673")
51+
self.assertEqual(assembly.data["ok"], "ASSEMBLY_COMPLETED")
52+
self.assertEqual(assembly.data["assembly_id"], "abcdef45673")
4653

4754
@requests_mock.Mocker()
4855
def test_save_resumable(self, mock):
49-
url = '{}/assemblies'.format(self.transloadit.service)
50-
mock.post(url, text=self.json_response,
51-
additional_matcher=request_body_matcher('tus_num_expected_upload_files=0'))
56+
url = f"{self.transloadit.service}/assemblies"
57+
mock.post(
58+
url,
59+
text=self.json_response,
60+
additional_matcher=request_body_matcher("tus_num_expected_upload_files=0"),
61+
)
5262

5363
assembly = self.assembly.create()
54-
self.assertEqual(assembly.data['ok'], "ASSEMBLY_COMPLETED")
55-
self.assertEqual(assembly.data['assembly_id'], "abcdef45673")
64+
self.assertEqual(assembly.data["ok"], "ASSEMBLY_COMPLETED")
65+
self.assertEqual(assembly.data["assembly_id"], "abcdef45673")

‎tests/test_client.py‎

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,83 +9,88 @@
99

1010
class ClientTest(unittest.TestCase):
1111
def setUp(self):
12-
self.transloadit = Transloadit('key', 'secret')
12+
self.transloadit = Transloadit("key", "secret")
1313

1414
@requests_mock.Mocker()
1515
def test_get_assembly(self, mock):
16-
id_ = 'abcdef12345'
17-
url = '{}/assemblies/{}'.format(self.transloadit.service, id_)
16+
id_ = "abcdef12345"
17+
url = f"{self.transloadit.service}/assemblies/{id_}"
1818
mock.get(url, text='{"ok": "ASSEMBLY_COMPLETED", "assembly_id": "abcdef12345"}')
1919

2020
response = self.transloadit.get_assembly(assembly_id=id_)
21-
self.assertEqual(response.data['ok'], 'ASSEMBLY_COMPLETED')
22-
self.assertEqual(response.data['assembly_id'], 'abcdef12345')
21+
self.assertEqual(response.data["ok"], "ASSEMBLY_COMPLETED")
22+
self.assertEqual(response.data["assembly_id"], "abcdef12345")
2323

2424
@requests_mock.Mocker()
2525
def test_list_assemblies(self, mock):
26-
url = '{}/assemblies'.format(self.transloadit.service)
26+
url = f"{self.transloadit.service}/assemblies"
2727
mock.get(url, text='{"items":[],"count":0}')
2828

2929
response = self.transloadit.list_assemblies()
30-
self.assertEqual(response.data['items'], [])
31-
self.assertEqual(response.data['count'], 0)
30+
self.assertEqual(response.data["items"], [])
31+
self.assertEqual(response.data["count"], 0)
3232

3333
@requests_mock.Mocker()
3434
def test_cancel_assembly(self, mock):
35-
id_ = 'abcdef12345'
36-
url = '{}/assemblies/{}'.format(self.transloadit.service, id_)
37-
mock.delete(url, text='{"ok": "ASSEMBLY_CANCELED", "assembly_id": "abcdef12345"}')
35+
id_ = "abcdef12345"
36+
url = f"{self.transloadit.service}/assemblies/{id_}"
37+
mock.delete(
38+
url, text='{"ok": "ASSEMBLY_CANCELED", "assembly_id": "abcdef12345"}'
39+
)
3840

3941
response = self.transloadit.cancel_assembly(id_)
40-
self.assertEqual(response.data['ok'], 'ASSEMBLY_CANCELED')
41-
self.assertEqual(response.data['assembly_id'], 'abcdef12345')
42+
self.assertEqual(response.data["ok"], "ASSEMBLY_CANCELED")
43+
self.assertEqual(response.data["assembly_id"], "abcdef12345")
4244

4345
@requests_mock.Mocker()
4446
def test_get_template(self, mock):
45-
id_ = 'abcdef12345'
46-
url = '{}/templates/{}'.format(self.transloadit.service, id_)
47+
id_ = "abcdef12345"
48+
url = f"{self.transloadit.service}/templates/{id_}"
4749
mock.get(url, text='{"ok": "TEMPLATE_FOUND", "template_id": "abcdef12345"}')
4850

4951
response = self.transloadit.get_template(id_)
50-
self.assertEqual(response.data['ok'], 'TEMPLATE_FOUND')
51-
self.assertEqual(response.data['template_id'], 'abcdef12345')
52+
self.assertEqual(response.data["ok"], "TEMPLATE_FOUND")
53+
self.assertEqual(response.data["template_id"], "abcdef12345")
5254

5355
@requests_mock.Mocker()
5456
def test_list_templates(self, mock):
55-
url = '{}/templates'.format(self.transloadit.service)
57+
url = f"{self.transloadit.service}/templates"
5658
mock.get(url, text='{"items":[],"count":0}')
5759

5860
response = self.transloadit.list_templates()
59-
self.assertEqual(response.data['items'], [])
60-
self.assertEqual(response.data['count'], 0)
61+
self.assertEqual(response.data["items"], [])
62+
self.assertEqual(response.data["count"], 0)
6163

6264
@requests_mock.Mocker()
6365
def test_update_template(self, mock):
64-
id_ = 'abcdef12345'
65-
url = '{}/templates/{}'.format(self.transloadit.service, id_)
66+
id_ = "abcdef12345"
67+
url = f"{self.transloadit.service}/templates/{id_}"
6668
sub_body = '"name": "foo_bar"'
67-
mock.put(url, text='{"ok": "TEMPLATE_UPDATED", "template_id": "abcdef12345"}',
68-
additional_matcher=request_body_matcher(urllib.parse.quote_plus(sub_body)))
69+
mock.put(
70+
url,
71+
text='{"ok": "TEMPLATE_UPDATED", "template_id": "abcdef12345"}',
72+
additional_matcher=request_body_matcher(urllib.parse.quote_plus(sub_body)),
73+
)
6974

70-
response = self.transloadit.update_template(id_, {'name': 'foo_bar'})
71-
self.assertEqual(response.data['ok'], 'TEMPLATE_UPDATED')
72-
self.assertEqual(response.data['template_id'], 'abcdef12345')
75+
response = self.transloadit.update_template(id_, {"name": "foo_bar"})
76+
self.assertEqual(response.data["ok"], "TEMPLATE_UPDATED")
77+
self.assertEqual(response.data["template_id"], "abcdef12345")
7378

7479
@requests_mock.Mocker()
7580
def test_delete_tempalte(self, mock):
76-
id_ = 'abcdef12345'
77-
url = '{}/templates/{}'.format(self.transloadit.service, id_)
81+
id_ = "abcdef12345"
82+
url = f"{self.transloadit.service}/templates/{id_}"
7883
mock.delete(url, text='{"ok": "TEMPLATE_DELETED"}')
7984

8085
response = self.transloadit.delete_template(id_)
81-
self.assertEqual(response.data['ok'], 'TEMPLATE_DELETED')
86+
self.assertEqual(response.data["ok"], "TEMPLATE_DELETED")
8287

8388
@requests_mock.Mocker()
8489
def test_get_bill(self, mock):
8590
year = 2017
8691
month = 9
87-
url = '/bill/{}-0{}'.format(year, month)
92+
url = f"/bill/{year}-0{month}"
8893
mock.get(url, text='{"ok":"BILL_FOUND"}')
8994

9095
response = self.transloadit.get_bill(month, year)
91-
self.assertEqual(response.data['ok'], 'BILL_FOUND')
96+
self.assertEqual(response.data["ok"], "BILL_FOUND")

‎tests/test_optionbuilder.py‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,35 @@ def setUp(self):
99

1010
def test_add_step(self):
1111
self.option_builder.add_step(
12-
'resize', '/image/resize', {'width': 70, 'height': 70})
12+
"resize", "/image/resize", {"width": 70, "height": 70}
13+
)
1314

14-
self.assertEqual(self.option_builder.steps, {'resize': {
15-
'robot': '/image/resize',
16-
'width': 70,
17-
'height': 70
18-
}})
15+
self.assertEqual(
16+
self.option_builder.steps,
17+
{"resize": {"robot": "/image/resize", "width": 70, "height": 70}},
18+
)
1919

2020
def test_remove_step(self):
2121
self.option_builder.add_step(
22-
'resize', '/image/resize', {'width': 70, 'height': 70})
23-
self.assertTrue('resize' in self.option_builder.steps)
22+
"resize", "/image/resize", {"width": 70, "height": 70}
23+
)
24+
self.assertTrue("resize" in self.option_builder.steps)
2425

25-
self.option_builder.remove_step('resize')
26-
self.assertFalse('resize' in self.option_builder.steps)
26+
self.option_builder.remove_step("resize")
27+
self.assertFalse("resize" in self.option_builder.steps)
2728

2829
def test_get_options(self):
2930
self.option_builder.add_step(
30-
'resize', '/image/resize', {'width': 70, 'height': 70})
31-
self.option_builder.options['template_id'] = 'foo'
32-
33-
self.assertEqual(self.option_builder.get_options(), {'steps': {'resize': {
34-
'robot': '/image/resize',
35-
'width': 70,
36-
'height': 70
37-
}}, 'template_id': 'foo'})
31+
"resize", "/image/resize", {"width": 70, "height": 70}
32+
)
33+
self.option_builder.options["template_id"] = "foo"
34+
35+
self.assertEqual(
36+
self.option_builder.get_options(),
37+
{
38+
"steps": {
39+
"resize": {"robot": "/image/resize", "width": 70, "height": 70}
40+
},
41+
"template_id": "foo",
42+
},
43+
)

‎tests/test_request.py‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,56 @@
1010

1111
class RequestTest(unittest.TestCase):
1212
def setUp(self):
13-
self.transloadit = Transloadit('key', 'secret')
13+
self.transloadit = Transloadit("key", "secret")
1414
self.request = Request(self.transloadit)
1515

1616
@requests_mock.Mocker()
1717
def test_get(self, mock):
18-
url = '{}/foo'.format(self.transloadit.service)
19-
mock.get(url, text='{"ok": "it works"}', request_headers={'Transloadit-Client': 'python-sdk:0.1.12'})
18+
url = f"{self.transloadit.service}/foo"
19+
mock.get(
20+
url,
21+
text='{"ok": "it works"}',
22+
request_headers={"Transloadit-Client": "python-sdk:0.1.12"},
23+
)
2024

21-
response = self.request.get('/foo')
22-
self.assertEqual(response.data['ok'], 'it works')
25+
response = self.request.get("/foo")
26+
self.assertEqual(response.data["ok"], "it works")
2327

2428
@requests_mock.Mocker()
2529
def test_post(self, mock):
26-
url = '{}/foo'.format(self.transloadit.service)
30+
url = f"{self.transloadit.service}/foo"
2731
sub_body = urllib.parse.quote_plus('"foo": "bar"')
28-
mock.post(url, text='{"ok": "it works"}',
29-
additional_matcher=request_body_matcher(sub_body))
32+
mock.post(
33+
url,
34+
text='{"ok": "it works"}',
35+
additional_matcher=request_body_matcher(sub_body),
36+
)
3037

31-
response = self.request.post('/foo', data={'foo': 'bar'})
32-
self.assertEqual(response.data['ok'], 'it works')
38+
response = self.request.post("/foo", data={"foo": "bar"})
39+
self.assertEqual(response.data["ok"], "it works")
3340

3441
@requests_mock.Mocker()
3542
def test_put(self, mock):
36-
url = '{}/foo'.format(self.transloadit.service)
43+
url = f"{self.transloadit.service}/foo"
3744
sub_body = urllib.parse.quote_plus('"foo": "bar"')
38-
mock.put(url, text='{"ok": "it works"}',
39-
additional_matcher=request_body_matcher(sub_body))
45+
mock.put(
46+
url,
47+
text='{"ok": "it works"}',
48+
additional_matcher=request_body_matcher(sub_body),
49+
)
4050

41-
response = self.request.put('/foo', data={'foo': 'bar'})
42-
self.assertEqual(response.data['ok'], 'it works')
51+
response = self.request.put("/foo", data={"foo": "bar"})
52+
self.assertEqual(response.data["ok"], "it works")
4353

4454
@requests_mock.Mocker()
4555
def test_delete(self, mock):
46-
url = '{}/foo'.format(self.transloadit.service)
56+
url = f"{self.transloadit.service}/foo"
4757
sub_body = urllib.parse.quote_plus('"foo": "bar"')
48-
mock.delete(url, text='{"ok": "it works"}',
49-
additional_matcher=request_body_matcher(sub_body))
58+
mock.delete(
59+
url,
60+
text='{"ok": "it works"}',
61+
additional_matcher=request_body_matcher(sub_body),
62+
)
5063

51-
response = self.request.delete('/foo', data={'foo': 'bar'})
52-
self.assertEqual(response.data['ok'], 'it works')
64+
response = self.request.delete("/foo", data={"foo": "bar"})
65+
self.assertEqual(response.data["ok"], "it works")

‎tests/test_template.py‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,20 @@
99

1010
class TemplateTest(unittest.TestCase):
1111
def setUp(self):
12-
self.transloadit = Transloadit('key', 'secret')
13-
self.template = self.transloadit.new_template('foo')
12+
self.transloadit = Transloadit("key", "secret")
13+
self.template = self.transloadit.new_template("foo")
1414

1515
@requests_mock.Mocker()
1616
def test_save(self, mock):
17-
url = '{}/templates'.format(self.transloadit.service)
17+
url = f"{self.transloadit.service}/templates"
1818
sub_body = '"robot": "/image/resize"'
19-
mock.post(url, text='{"ok":"TEMPLATE_CREATED","template_name":"foo"}',
20-
additional_matcher=request_body_matcher(urllib.parse.quote_plus(sub_body)))
19+
mock.post(
20+
url,
21+
text='{"ok":"TEMPLATE_CREATED","template_name":"foo"}',
22+
additional_matcher=request_body_matcher(urllib.parse.quote_plus(sub_body)),
23+
)
2124

22-
self.template.add_step('resize', '/image/resize', {'width': 70, 'height': 70})
25+
self.template.add_step("resize", "/image/resize", {"width": 70, "height": 70})
2326
template = self.template.create()
24-
self.assertEqual(template.data['ok'], "TEMPLATE_CREATED")
25-
self.assertEqual(template.data['template_name'], "foo")
27+
self.assertEqual(template.data["ok"], "TEMPLATE_CREATED")
28+
self.assertEqual(template.data["template_name"], "foo")

0 commit comments

Comments
 (0)