dshellInterpreter 0.2.4.2__tar.gz → 0.2.4.4__tar.gz

{dshellinterpreter-0.2.4.2 → dshellinterpreter-0.2.4.4}/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,

{dshellinterpreter-0.2.4.2 → dshellinterpreter-0.2.4.4}/Dshell/__init__.py

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

dshellinterpreter-0.2.4.4/Dshell/_utils.py

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

{dshellinterpreter-0.2.4.2/dshellInterpreter.egg-info → dshellinterpreter-0.2.4.4}/PKG-INFO

@@ -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 → dshellinterpreter-0.2.4.4/dshellInterpreter.egg-info}/PKG-INFO

@@ -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 → dshellinterpreter-0.2.4.4}/dshellInterpreter.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 setup.py
 Dshell/__init__.py
+Dshell/_utils.py
 Dshell/DISCORD_COMMANDS/__init__.py
 Dshell/DISCORD_COMMANDS/dshell_channel.py
 Dshell/DISCORD_COMMANDS/dshell_member.py

{dshellinterpreter-0.2.4.2 → dshellinterpreter-0.2.4.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="dshellInterpreter",
-    version="0.2.4.2",
+    version="0.2.4.4",
     author="Chronos",
     author_email="vagabonwalybi@gmail.com",
     description="A Discord bot interpreter for creating custom commands and automations.",