Skip to content

Commit a65f73a

Browse files
ShreehariVaasishtaShreehariVaasishta
authored
Migrate to f string. (#48)
1 parent 87dd1bf commit a65f73a

8 files changed

Lines changed: 75 additions & 77 deletions

File tree

‎stream_chat/async_chat/channel.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ async def send_message(self, message, user_id):
1313
:return: the Server Response
1414
"""
1515
payload = {"message": add_user_id(message, user_id)}
16-
return await self.client.post("{}/message".format(self.url), data=payload)
16+
return await self.client.post(f"{self.url}/message", data=payload)
1717

1818
async def send_event(self, event, user_id):
1919
"""
@@ -24,7 +24,7 @@ async def send_event(self, event, user_id):
2424
:return: the Server Response
2525
"""
2626
payload = {"event": add_user_id(event, user_id)}
27-
return await self.client.post("{}/event".format(self.url), data=payload)
27+
return await self.client.post(f"{self.url}/event", data=payload)
2828

2929
async def send_reaction(self, message_id, reaction, user_id):
3030
"""
@@ -37,7 +37,7 @@ async def send_reaction(self, message_id, reaction, user_id):
3737
"""
3838
payload = {"reaction": add_user_id(reaction, user_id)}
3939
return await self.client.post(
40-
"messages/{}/reaction".format(message_id), data=payload
40+
f"messages/{message_id}/reaction", data=payload
4141
)
4242

4343
async def delete_reaction(self, message_id, reaction_type, user_id):
@@ -50,7 +50,7 @@ async def delete_reaction(self, message_id, reaction_type, user_id):
5050
:return: the Server Response
5151
"""
5252
return await self.client.delete(
53-
"messages/{}/reaction/{}".format(message_id, reaction_type),
53+
f"messages/{message_id}/reaction/{reaction_type}",
5454
params={"user_id": user_id},
5555
)
5656

@@ -73,11 +73,11 @@ async def query(self, **options):
7373
"""
7474
payload = {"state": True, "data": self.custom_data, **options}
7575

76-
url = "channels/{}".format(self.channel_type)
76+
url = f"channels/{self.channel_type}"
7777
if self.id is not None:
78-
url = "{}/{}".format(url, self.id)
78+
url = f"{url}/{self.id}"
7979

80-
state = await self.client.post("{}/query".format(url), data=payload)
80+
state = await self.client.post(f"{url}/query", data=payload)
8181

8282
if self.id is None:
8383
self.id = state["channel"]["id"]
@@ -137,7 +137,7 @@ async def truncate(self):
137137
138138
:return: The server response
139139
"""
140-
return await self.client.post("{}/truncate".format(self.url))
140+
return await self.client.post(f"{self.url}/truncate")
141141

142142
async def add_members(self, user_ids):
143143
"""
@@ -193,7 +193,7 @@ async def mark_read(self, user_id, **data):
193193
:return: The server response
194194
"""
195195
payload = add_user_id(data, user_id)
196-
return await self.client.post("{}/read".format(self.url), data=payload)
196+
return await self.client.post(f"{self.url}/read", data=payload)
197197

198198
async def get_replies(self, parent_id, **options):
199199
"""
@@ -204,7 +204,7 @@ async def get_replies(self, parent_id, **options):
204204
:return: A response with a list of messages
205205
"""
206206
return await self.client.get(
207-
"messages/{}/replies".format(parent_id), params=options
207+
f"messages/{parent_id}/replies", params=options
208208
)
209209

210210
async def get_reactions(self, message_id, **options):
@@ -216,7 +216,7 @@ async def get_reactions(self, message_id, **options):
216216
:return: A response with a list of reactions
217217
"""
218218
return await self.client.get(
219-
"messages/{}/reactions".format(message_id), params=options
219+
f"messages/{message_id}/reactions", params=options
220220
)
221221

222222
async def ban_user(self, target_id, **options):
@@ -258,26 +258,26 @@ async def reject_invite(self, user_id, **data):
258258

259259
async def send_file(self, url, name, user, content_type=None):
260260
return await self.client.send_file(
261-
"{}/file".format(self.url), url, name, user, content_type=content_type
261+
f"{self.url}/file", url, name, user, content_type=content_type
262262
)
263263

264264
async def send_image(self, url, name, user, content_type=None):
265265
return await self.client.send_file(
266-
"{}/image".format(self.url), url, name, user, content_type=content_type
266+
f"{self.url}/image", url, name, user, content_type=content_type
267267
)
268268

269269
async def delete_file(self, url):
270-
return await self.client.delete("{}/file".format(self.url), {"url": url})
270+
return await self.client.delete(f"{self.url}/file", {"url": url})
271271

272272
async def delete_image(self, url):
273-
return await self.client.delete("{}/image".format(self.url), {"url": url})
273+
return await self.client.delete(f"{self.url}/image", {"url": url})
274274

275275
async def hide(self, user_id):
276276
return await self.client.post(
277-
"{}/hide".format(self.url), data={"user_id": user_id}
277+
f"{self.url}/hide", data={"user_id": user_id}
278278
)
279279

280280
async def show(self, user_id):
281281
return await self.client.post(
282-
"{}/show".format(self.url), data={"user_id": user_id}
282+
f"{self.url}/show", data={"user_id": user_id}
283283
)

‎stream_chat/async_chat/client.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ async def _make_request(self, method, relative_url, params=None, data=None):
5454
headers["Authorization"] = self.auth_token
5555
headers["stream-auth-type"] = "jwt"
5656

57-
url = "{}/{}".format(self.base_url, relative_url)
57+
url = f"{self.base_url}/{relative_url}"
5858

5959
if method.__name__ in ["post", "put", "patch"]:
6060
serialized = json.dumps(data)
@@ -102,16 +102,16 @@ async def update_user_partial(self, update):
102102
return await self.update_users_partial([update])
103103

104104
async def delete_user(self, user_id, **options):
105-
return await self.delete("users/{}".format(user_id), options)
105+
return await self.delete(f"users/{user_id}", options)
106106

107107
async def deactivate_user(self, user_id, **options):
108-
return await self.post("users/{}/deactivate".format(user_id), data=options)
108+
return await self.post(f"users/{user_id}/deactivate", data=options)
109109

110110
async def reactivate_user(self, user_id, **options):
111-
return await self.post("users/{}/reactivate".format(user_id), data=options)
111+
return await self.post(f"users/{user_id}/reactivate", data=options)
112112

113113
async def export_user(self, user_id, **options):
114-
return await self.get("users/{}/export".format(user_id), options)
114+
return await self.get(f"users/{user_id}/export", options)
115115

116116
async def ban_user(self, target_id, **options):
117117
data = {"target_user_id": target_id, **options}
@@ -168,14 +168,14 @@ async def update_message(self, message):
168168
if message.get("id") is None:
169169
raise ValueError("message must have an id")
170170
return await self.post(
171-
"messages/{}".format(message["id"]), data={"message": message}
171+
f"messages/{message['id']}", data={"message": message}
172172
)
173173

174174
async def delete_message(self, message_id, **options):
175-
return await self.delete("messages/{}".format(message_id), options)
175+
return await self.delete(f"messages/{message_id}", options)
176176

177177
async def get_message(self, message_id):
178-
return await self.get("messages/{}".format(message_id))
178+
return await self.get(f"messages/{message_id}")
179179

180180
async def query_users(self, filter_conditions, sort=None, **options):
181181
params = options.copy()
@@ -198,13 +198,13 @@ async def create_channel_type(self, data):
198198
return await self.post("channeltypes", data=data)
199199

200200
async def get_channel_type(self, channel_type):
201-
return await self.get("channeltypes/{}".format(channel_type))
201+
return await self.get(f"channeltypes/{channel_type}")
202202

203203
async def list_channel_types(self):
204204
return await self.get("channeltypes")
205205

206206
async def update_channel_type(self, channel_type, **settings):
207-
return await self.put("channeltypes/{}".format(channel_type), data=settings)
207+
return await self.put(f"channeltypes/{channel_type}", data=settings)
208208

209209
async def delete_channel_type(self, channel_type):
210210
"""
@@ -213,7 +213,7 @@ async def delete_channel_type(self, channel_type):
213213
:param channel_type: the channel type
214214
:return:
215215
"""
216-
return await self.delete("channeltypes/{}".format(channel_type))
216+
return await self.delete(f"channeltypes/{channel_type}")
217217

218218
def channel(self, channel_type, channel_id=None, data=None):
219219
"""
@@ -233,13 +233,13 @@ async def create_command(self, data):
233233
return await self.post("commands", data=data)
234234

235235
async def delete_command(self, name):
236-
return await self.delete("commands/{}".format(name))
236+
return await self.delete(f"commands/{name}")
237237

238238
async def get_command(self, name):
239-
return await self.get("commands/{}".format(name))
239+
return await self.get(f"commands/{name}")
240240

241241
async def update_command(self, name, **settings):
242-
return await self.put("commands/{}".format(name), data=settings)
242+
return await self.put(f"commands/{name}", data=settings)
243243

244244
async def add_device(self, device_id, push_provider, user_id):
245245
"""
@@ -297,7 +297,7 @@ async def send_file(self, uri, url, name, user, content_type=None):
297297
data.add_field("user", json.dumps(user))
298298
data.add_field("file", content, filename=name, content_type=content_type)
299299
async with self.session.post(
300-
"{}/{}".format(self.base_url, uri),
300+
f"{self.base_url}/{uri}",
301301
params=self.get_default_params(),
302302
data=data,
303303
headers=headers,
@@ -328,7 +328,7 @@ async def get_blocklist(self, name):
328328
:param name: the name of the blocklist
329329
:return: blocklist dict representation
330330
"""
331-
return await self.get("blocklists/{}".format(name))
331+
return await self.get(f"blocklists/{name}")
332332

333333
async def update_blocklist(self, name, words):
334334
"""
@@ -338,15 +338,15 @@ async def update_blocklist(self, name, words):
338338
:param words: the list of blocked words (replaces the current list)
339339
:return:
340340
"""
341-
return await self.put("blocklists/{}".format(name), data={"words": words})
341+
return await self.put(f"blocklists/{name}", data={"words": words})
342342

343343
async def delete_blocklist(self, name):
344344
"""Delete a blocklist by name
345345
346346
:param: the name of the blocklist
347347
:return:
348348
"""
349-
return await self.delete("blocklists/{}".format(name))
349+
return await self.delete(f"blocklists/{name}")
350350

351351
async def close(self):
352352
await self.session.close()

‎stream_chat/base/channel.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def __init__(self, client, channel_type, channel_id=None, custom_data=None):
1616
def url(self):
1717
if self.id is None:
1818
raise StreamChannelException("channel does not have an id")
19-
return "channels/{}/{}".format(self.channel_type, self.id)
19+
return f'channels/{self.channel_type}/{self.id}'
2020

2121
@abc.abstractmethod
2222
def send_message(self, message, user_id):

‎stream_chat/base/exceptions.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ def __init__(self, text, status_code):
2121

2222
def __str__(self):
2323
if self.json_response:
24-
return "StreamChat error code {}: {}".format(
25-
self.error_code, self.error_message
26-
)
24+
return f'StreamChat error code {self.error_code}: {self.error_message}"'
2725
else:
28-
return "StreamChat error HTTP code: {}".format(self.status_code)
26+
return f'StreamChat error HTTP code: {self.status_code}'

‎stream_chat/channel.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def send_message(self, message, user_id):
1313
:return: the Server Response
1414
"""
1515
payload = {"message": add_user_id(message, user_id)}
16-
return self.client.post("{}/message".format(self.url), data=payload)
16+
return self.client.post(f"{self.url}/message", data=payload)
1717

1818
def send_event(self, event, user_id):
1919
"""
@@ -24,7 +24,7 @@ def send_event(self, event, user_id):
2424
:return: the Server Response
2525
"""
2626
payload = {"event": add_user_id(event, user_id)}
27-
return self.client.post("{}/event".format(self.url), data=payload)
27+
return self.client.post(f"{self.url}/event", data=payload)
2828

2929
def send_reaction(self, message_id, reaction, user_id):
3030
"""
@@ -36,7 +36,7 @@ def send_reaction(self, message_id, reaction, user_id):
3636
:return: the Server Response
3737
"""
3838
payload = {"reaction": add_user_id(reaction, user_id)}
39-
return self.client.post("messages/{}/reaction".format(message_id), data=payload)
39+
return self.client.post(f"messages/{message_id}/reaction", data=payload)
4040

4141
def delete_reaction(self, message_id, reaction_type, user_id):
4242
"""
@@ -48,7 +48,7 @@ def delete_reaction(self, message_id, reaction_type, user_id):
4848
:return: the Server Response
4949
"""
5050
return self.client.delete(
51-
"messages/{}/reaction/{}".format(message_id, reaction_type),
51+
f"messages/{message_id}/reaction/{reaction_type}",
5252
params={"user_id": user_id},
5353
)
5454

@@ -71,11 +71,11 @@ def query(self, **options):
7171
"""
7272
payload = {"state": True, "data": self.custom_data, **options}
7373

74-
url = "channels/{}".format(self.channel_type)
74+
url = f"channels/{self.channel_type}"
7575
if self.id is not None:
76-
url = "{}/{}".format(url, self.id)
76+
url = f"{url}/{self.id}"
7777

78-
state = self.client.post("{}/query".format(url), data=payload)
78+
state = self.client.post(f"{url}/query", data=payload)
7979

8080
if self.id is None:
8181
self.id = state["channel"]["id"]
@@ -133,7 +133,7 @@ def truncate(self):
133133
134134
:return: The server response
135135
"""
136-
return self.client.post("{}/truncate".format(self.url))
136+
return self.client.post(f"{self.url}/truncate")
137137

138138
def add_members(self, user_ids):
139139
"""
@@ -189,7 +189,7 @@ def mark_read(self, user_id, **data):
189189
:return: The server response
190190
"""
191191
payload = add_user_id(data, user_id)
192-
return self.client.post("{}/read".format(self.url), data=payload)
192+
return self.client.post(f"{self.url}/read", data=payload)
193193

194194
def get_replies(self, parent_id, **options):
195195
"""
@@ -199,7 +199,7 @@ def get_replies(self, parent_id, **options):
199199
:param options: Pagination params, ie {limit:10, id_lte: 10}
200200
:return: A response with a list of messages
201201
"""
202-
return self.client.get("messages/{}/replies".format(parent_id), params=options)
202+
return self.client.get(f"messages/{parent_id}/replies", params=options)
203203

204204
def get_reactions(self, message_id, **options):
205205
"""
@@ -210,7 +210,7 @@ def get_reactions(self, message_id, **options):
210210
:return: A response with a list of reactions
211211
"""
212212
return self.client.get(
213-
"messages/{}/reactions".format(message_id), params=options
213+
f"messages/{message_id}/reactions", params=options
214214
)
215215

216216
def ban_user(self, target_id, **options):
@@ -252,22 +252,22 @@ def reject_invite(self, user_id, **data):
252252

253253
def send_file(self, url, name, user, content_type=None):
254254
return self.client.send_file(
255-
"{}/file".format(self.url), url, name, user, content_type=content_type
255+
f"{self.url}/file", url, name, user, content_type=content_type
256256
)
257257

258258
def send_image(self, url, name, user, content_type=None):
259259
return self.client.send_file(
260-
"{}/image".format(self.url), url, name, user, content_type=content_type
260+
f"{self.url}/image", url, name, user, content_type=content_type
261261
)
262262

263263
def delete_file(self, url):
264-
return self.client.delete("{}/file".format(self.url), {"url": url})
264+
return self.client.delete(f"{self.url}/file", {"url": url})
265265

266266
def delete_image(self, url):
267-
return self.client.delete("{}/image".format(self.url), {"url": url})
267+
return self.client.delete(f"{self.url}/image", {"url": url})
268268

269269
def hide(self, user_id):
270-
return self.client.post("{}/hide".format(self.url), data={"user_id": user_id})
270+
return self.client.post(f"{self.url}/hide", data={"user_id": user_id})
271271

272272
def show(self, user_id):
273-
return self.client.post("{}/show".format(self.url), data={"user_id": user_id})
273+
return self.client.post(f"{self.url}/show", data={"user_id": user_id})

0 commit comments

Comments
 (0)