CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[V3]Encoding issue fix" (#1392)

Browse Source 
* Revert "[V3 Core] Encoding issue fix (#1365)"

This reverts commit f6903cf5820ec93833aced058622cb2f235ac22b.

* Don't let the system encoding screw with things,
specify opens as happening with utf-8 encoding

(cherry picked from commit c10e4dddca32a7a74978f2938359be8a65e7e40f)
This commit is contained in:
Michael H 2018-03-05 16:18:41 -05:00 committed by Tobotimus
parent f6903cf582
commit b4f5c2c0a1
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
redbot/cogs/mod/mod.py
View File

@ -322,7 +322,7 @@ class Mod:
except discord.errors.Forbidden: except discord.errors.Forbidden:
await ctx.send(_("I'm not allowed to do that.")) await ctx.send(_("I'm not allowed to do that."))
except Exception as e: except Exception as e:
print(str(e, encoding='utf-8', errors='replace')) print(e)
else: else:
await ctx.send(_("Done. That felt good.")) await ctx.send(_("Done. That felt good."))
@ -379,7 +379,7 @@ class Mod:
await ctx.send(_("I'm not allowed to do that.")) await ctx.send(_("I'm not allowed to do that."))
except Exception as e: except Exception as e:
self.ban_queue.remove(queue_entry) self.ban_queue.remove(queue_entry)
print(str(e, encoding='utf-8', errors='replace')) print(e)
else: else:
await ctx.send(_("Done. It was about time.")) await ctx.send(_("Done. It was about time."))
@ -540,14 +540,14 @@ class Mod:
return return
except discord.HTTPException as e: except discord.HTTPException as e:
self.ban_queue.remove(queue_entry) self.ban_queue.remove(queue_entry)
print(str(e, encoding='utf-8', errors='replace')) print(e)
return return
self.unban_queue.append(queue_entry) self.unban_queue.append(queue_entry)
try: try:
await guild.unban(user) await guild.unban(user)
except discord.HTTPException as e: except discord.HTTPException as e:
self.unban_queue.remove(queue_entry) self.unban_queue.remove(queue_entry)
print(str(e, encoding='utf-8', errors='replace')) print(e)
return return
else: else:
await ctx.send(_("Done. Enough chaos.")) await ctx.send(_("Done. Enough chaos."))
@ -1209,7 +1209,7 @@ class Mod:
"Mention spam (Autoban)", until=None, channel=None "Mention spam (Autoban)", until=None, channel=None
) )
except RuntimeError as e: except RuntimeError as e:
print(str(e, encoding='utf-8', errors='replace')) print(e)
return False return False
return True return True
return False return False
@ -1269,7 +1269,7 @@ class Mod:
"ban", member, mod, "ban", member, mod,
reason if reason else None) reason if reason else None)
except RuntimeError as e: except RuntimeError as e:
print(str(e, encoding='utf-8', errors='replace')) print(e)
async def on_member_unban(self, guild: discord.Guild, user: discord.User): async def on_member_unban(self, guild: discord.Guild, user: discord.User):
if (guild.id, user.id) in self.unban_queue: if (guild.id, user.id) in self.unban_queue:
@ -1287,7 +1287,7 @@ class Mod:
await modlog.create_case(guild, date, "unban", await modlog.create_case(guild, date, "unban",
user, mod, reason) user, mod, reason)
except RuntimeError as e: except RuntimeError as e:
print(str(e, encoding='utf-8', errors='replace')) print(e)
async def get_audit_entry_info(self, async def get_audit_entry_info(self,
guild: discord.Guild, guild: discord.Guild,

5
redbot/core/events.py
View File

@ -140,10 +140,7 @@ def init_events(bot, cli_flags):
print(Fore.RED + INTRO) print(Fore.RED + INTRO)
print(Style.RESET_ALL) print(Style.RESET_ALL)
print( print(bordered(INFO, INFO2, ascii_border=ascii_border))
str(bordered(INFO, INFO2, ascii_border=ascii_border),
encoding='utf-8', errors='replace')
)
if invite_url: if invite_url:
print("\nInvite URL: {}\n".format(invite_url)) print("\nInvite URL: {}\n".format(invite_url))