BF

bleudev · Jul 30, 2022 · a1f91e1 · a1f91e1
1 parent 717abcb
commit a1f91e1
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 15 deletions.
diff --git a/disspy/__init__.py b/disspy/__init__.py
@@ -36,6 +36,7 @@
 import disspy.message
 import disspy.user
 import disspy.reaction
+import disspy.ui
 
 # Classes
 from disspy.activity import (
@@ -113,7 +114,7 @@
 
 
 # Methods for other varibles
-def _all_generator(alls: list[tuple]) -> tuple:
+def _all_generator(alls: list) -> tuple:
     result = []
 
     for file_all in alls:
@@ -144,7 +145,7 @@ def _all_generator(alls: list[tuple]) -> tuple:
 
 
 # __all__
-__alls__: list[tuple] = [
+__alls__: list = [
     disspy.activity.__all__,
     disspy.application_commands.__all__,
     disspy.channel.__all__,
@@ -157,6 +158,7 @@ def _all_generator(alls: list[tuple]) -> tuple:
     disspy.message.__all__,
     disspy.user.__all__,
     disspy.reaction.__all__
+    disspy.ui.__all__
 ]
 
 __all__: tuple = _all_generator(__alls__)
diff --git a/disspy/activity.py b/disspy/activity.py
@@ -23,7 +23,7 @@
 """
 
 
-__all__: tuple[str] = (
+__all__: tuple = (
     "Activity",
     "ActivityType"
 )

diff --git a/disspy/application_commands.py b/disspy/application_commands.py
@@ -38,7 +38,7 @@
 from disspy.jsongenerators import _OptionGenerator
 from disspy.ui import ActionRow
 
-__all__: tuple[str] = (
+__all__: tuple = (
     "ApplicationCommandType",
     "ApplicationCommand",
     "Option",

diff --git a/disspy/channel.py b/disspy/channel.py
@@ -32,7 +32,7 @@
     Union
 )
 
-__all__: tuple[str] = (
+__all__: tuple = (
     "DisChannel",
     "DisDmChannel"
 )

diff --git a/disspy/client.py b/disspy/client.py
@@ -63,7 +63,7 @@
 from disspy.logger import Logger
 from disspy.user import DisUser
 
-__all__: tuple[str] = (
+__all__: tuple = (
     "DisBotStatus",
     "DisBotEventType",
     "DisBot"

diff --git a/disspy/core.py b/disspy/core.py
@@ -61,7 +61,7 @@
 JsonOutput = NewType("JsonOutput", Dict[str, Any])
 
 # __all__
-__all__: tuple[str] = (
+__all__: tuple = (
     # Classes for simpler creating other classes
     "JsonOutput",
     "FlowOpcodes",

diff --git a/disspy/embed.py b/disspy/embed.py
@@ -35,7 +35,7 @@
 from math import floor
 import typing
 
-__all__: tuple[str] = (
+__all__: tuple = (
     "DisColor",
     "DisField",
     "DisEmbed"

diff --git a/disspy/errors.py b/disspy/errors.py
@@ -28,7 +28,7 @@
 missingperms = "Missing permissions!"
 
 # __all__
-__all__: tuple[str] = (
+__all__: tuple = (
     "InternetError",
     "MissingPerms",
     "Unauthorized",

diff --git a/disspy/guild.py b/disspy/guild.py
@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__all__: tuple[str] = (
+__all__: tuple = (
     "DisGuildTemplate",
     "DisGuild"
 )

diff --git a/disspy/logger.py b/disspy/logger.py
@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__all__: tuple[str] = (
+__all__: tuple = (
     "Logger"
 )
 

diff --git a/disspy/message.py b/disspy/message.py
@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__all__: tuple[str] = (
+__all__: tuple = (
     "DisMessage",
     "DmMessage",
     "MessageDeleteEvent",

diff --git a/disspy/reaction.py b/disspy/reaction.py
@@ -30,7 +30,7 @@
 
 from disspy.user import DisUser
 
-__all__: tuple[str] = (
+__all__: tuple = (
     "DisEmoji",
     "DisOwnReaction",
     "DisReaction",

diff --git a/disspy/ui.py b/disspy/ui.py
@@ -33,6 +33,17 @@
 from disspy.reaction import DisEmoji
 from disspy import errors
 
+__all__: tuple = (
+    "Component",
+    "Button",
+    "ButtonStyle",
+    "SelectMenuOption",
+    "SelectMenu",
+    "TextInput",
+    "TextInputStyle",
+    "ActionRow"
+)
+
 
 class Component:
     """

diff --git a/disspy/user.py b/disspy/user.py
@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__all__: tuple[str] = (
+__all__: tuple = (
     "DisUser"
 )
 

diff --git a/setup.py b/setup.py
@@ -4,7 +4,10 @@
 with open("README.md", "r", encoding="utf-8") as mdf:
     long_description = mdf.read()
 
-requires = ["aiohttp>=3.6.0,<4", "requests", "typing", "asyncio", "colorama"]
+requires = ''
+
+with open("requirements.txt","r") as f:
+    requires = f.read().splitlines()
 
 
 setup(
@@ -18,6 +21,9 @@
     long_description_content_type="text/markdown",
     url="https://github.com/itttgg/dispy",
     packages=['disspy'],
+    classifiers = [
+        "Programming Language :: Python :: 3"
+    ],
     zip_safe=False,
     python_requires=">=3.8",
     install_requires=requires