dshellInterpreter 0.2.4.2__py3-none-any.whl → 0.2.4.4__py3-none-any.whl

Dshell/DISCORD_COMMANDS/dshell_role.py

@@ -1,5 +1,6 @@
 from discord import MISSING, Message, PermissionOverwrite
 from discord.utils import _MissingSentinel
+from .._utils import NoneType
 
 __all__ = [
     'dshell_create_role',
@@ -26,7 +27,8 @@ async def dshell_create_role(ctx: Message,
 
     from .._DshellInterpreteur.dshell_interpreter import build_colour
 
-    colour = build_colour(color)
+    if not isinstance(color, _MissingSentinel):
+        color = build_colour(color)
 
     if not isinstance(hoist, (bool, _MissingSentinel)):
         raise Exception(f"Hoist must be a boolean, not {type(permissions)} !")
@@ -41,7 +43,7 @@ async def dshell_create_role(ctx: Message,
 
     created_role = await ctx.guild.create_role(name=name,
                                                permissions=permissions,
-                                               colour=colour,
+                                               colour=color,
                                                hoist=hoist,
                                                mentionable=mentionable,
                                                reason=str(reason))
@@ -87,10 +89,10 @@ async def dshell_edit_role(ctx: Message,
 
     role_to_edit = ctx.guild.get_role(role)
 
-    if not isinstance(name, (str, None)):
+    if not isinstance(name, (str, NoneType)):
         raise Exception(f"Name must be a string, not {type(name)} !")
 
-    if not isinstance(permissions, (dict, None)):
+    if not isinstance(permissions, (dict, NoneType)):
         raise Exception(f"Permissions must be a PermissionNode, not {type(permissions)} !")
 
     if isinstance(permissions, dict):
@@ -100,20 +102,21 @@ async def dshell_edit_role(ctx: Message,
 
     from .._DshellInterpreteur.dshell_interpreter import build_colour
 
-    colour = build_colour(color)
+    if color is not None:
+        color = build_colour(color)
 
-    if not isinstance(hoist, (bool, None)):
+    if not isinstance(hoist, (bool, NoneType)):
         raise Exception(f"Hoist must be a boolean, not {type(permissions)} !")
 
-    if not isinstance(mentionable, (bool, None)):
+    if not isinstance(mentionable, (bool, NoneType)):
         raise Exception(f"Mentionable must be a boolean, not {type(permissions)} !")
 
-    if not isinstance(position, (int, None)):
+    if not isinstance(position, (int, NoneType)):
         raise Exception(f"Position must be an integer, not {type(permissions)} !")
 
     await role_to_edit.edit(name=name if name is not None else role_to_edit.name,
                             permissions=permissions if permissions is not None else role_to_edit.permissions,
-                            colour=colour if color is not None else role_to_edit.colour,
+                            colour=color if color is not None else role_to_edit.colour,
                             hoist=hoist if hoist is not None else role_to_edit.hoist,
                             mentionable=mentionable if mentionable is not None else role_to_edit.mentionable,
                             position=position if position is not None else role_to_edit.position,

Dshell/__init__.py

@@ -1 +1,2 @@
 from ._DshellInterpreteur.dshell_interpreter import DshellInterpreteur
+from ._utils import *

Dshell/_utils.py

@@ -0,0 +1 @@
+NoneType = type(None)

{dshellinterpreter-0.2.4.2.dist-info → dshellinterpreter-0.2.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.4.2
+Version: 0.2.4.4
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos

{dshellinterpreter-0.2.4.2.dist-info → dshellinterpreter-0.2.4.4.dist-info}/RECORD

@@ -1,10 +1,11 @@
-Dshell/__init__.py,sha256=UPvXnewe_8FX9aoevMA78UN1k8AY-u8LTY3vEVxaDxw,72
+Dshell/__init__.py,sha256=pGd94FPy8kVXH_jH566HhApQPhbPfMPnZXzH_0dPWh0,93
+Dshell/_utils.py,sha256=PJ3fwn8IMqUMnW9oTwfr9v4--rzHIhhLQoVVqjwjoJU,23
 Dshell/DISCORD_COMMANDS/__init__.py,sha256=_oo_aMEju4gZg-MIbF8bKMVM6CWAF0AO9DxAlemaXMw,149
 Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=2qnbI2tUu5sowJVOVkY4p-l6Gu-5Gw9BEP3MItScvV8,8939
 Dshell/DISCORD_COMMANDS/dshell_member.py,sha256=KEdI14VTmDJm3zb4Mt-cFe71Jdsrolj6O8673Vzw4n8,5943
 Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=fLxj_Ns-krZgXEPijhWvBFLorvmbleR6JpVOR72BIa8,5180
 Dshell/DISCORD_COMMANDS/dshell_pastbin.py,sha256=TkWFGRRTvhhJgvwkDFx9Fz4UM2UUFwxyq0laMVx0mUk,881
-Dshell/DISCORD_COMMANDS/dshell_role.py,sha256=vpf3v_FLdkeQdWL_7eW5P4M-Tk0sKndvOZ-tkRnjCBg,4777
+Dshell/DISCORD_COMMANDS/dshell_role.py,sha256=KUoyBf4xNvg0ahlM_l5gePfaOfwJ8rImfT3JnQsIeMM,4908
 Dshell/_DshellInterpreteur/__init__.py,sha256=xy5-J-R3YmY99JF3NBHTRRLsComFxpjnCA5xacISctU,35
 Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=dJS8frzNhKEvs-WdC7kwcZMZKefraWO4t8vLrFctjvA,22805
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
@@ -14,8 +15,8 @@ Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8q
 Dshell/_DshellTokenizer/dshell_keywords.py,sha256=G9qdXr-d05QtmBdwTGa1qMDm7TDbIEkbx_-ERU97Ods,4664
 Dshell/_DshellTokenizer/dshell_token_type.py,sha256=pWzvmj6EFGkDwNHooOAjdyysi1vZRVEostFIZSW1Ais,1483
 Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=-EhwrfbcOcnAxOHWBE89531t25u6c6HmJuT1AKFn9Ew,7032
-dshellinterpreter-0.2.4.2.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.4.2.dist-info/METADATA,sha256=bw76lXZufFvvnfLChu23WIeXbHFcCuaUHPeheYP7RF0,1122
-dshellinterpreter-0.2.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.4.2.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.4.2.dist-info/RECORD,,
+dshellinterpreter-0.2.4.4.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.4.4.dist-info/METADATA,sha256=V122a3qdmtpQ3UzZa0b2Ql0rGXx1sWJfZxmWef6LwY8,1122
+dshellinterpreter-0.2.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.4.4.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.4.4.dist-info/RECORD,,