From 7839d8bf108ddbcea9632ee97377f5dd297e79c3 Mon Sep 17 00:00:00 2001 From: Rishov Sarkar Date: Mon, 16 Dec 2019 22:57:35 -0500 Subject: [PATCH] Rework directory structure First, venvs are cool, so add them to the .gitignore. Second, if I do python3 setup.py develop, it doesn't work properly because of the package_dirs entry (see pypa/setuptools#230). So, rename the source directory to botbot so as to not need package_dirs (uglier in my opinion, but whatever). Third, use relative imports, because relative imports are cool (and because DRY). --- .gitignore | 1 + {source => botbot}/__init__.py | 0 {source => botbot}/__main__.py | 6 +++--- {source => botbot}/agentid_room.py | 0 {source => botbot}/botbot.py | 12 ++++++------ {source => botbot}/botbotbot.py | 9 +++++---- {source => botbot}/botcollection.py | 6 +++--- {source => botbot}/botparser.py | 4 ++-- {source => botbot}/euphutils.py | 0 {source => botbot}/logger.py | 0 {source => botbot}/longmessage_room.py | 0 {source => botbot}/main.py | 6 +++--- {source => botbot}/snapshot.py | 2 +- setup.py | 1 - 14 files changed, 24 insertions(+), 23 deletions(-) rename {source => botbot}/__init__.py (100%) rename {source => botbot}/__main__.py (87%) rename {source => botbot}/agentid_room.py (100%) rename {source => botbot}/botbot.py (97%) rename {source => botbot}/botbotbot.py (98%) rename {source => botbot}/botcollection.py (96%) rename {source => botbot}/botparser.py (99%) rename {source => botbot}/euphutils.py (100%) rename {source => botbot}/logger.py (100%) rename {source => botbot}/longmessage_room.py (100%) rename {source => botbot}/main.py (97%) rename {source => botbot}/snapshot.py (99%) diff --git a/.gitignore b/.gitignore index 04f1a5a..baf8314 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ __pycache__/ # Distribution / packaging .Python env/ +venv/ build/ develop-eggs/ dist/ diff --git a/source/__init__.py b/botbot/__init__.py similarity index 100% rename from source/__init__.py rename to botbot/__init__.py diff --git a/source/__main__.py b/botbot/__main__.py similarity index 87% rename from source/__main__.py rename to botbot/__main__.py index c7f997c..1ef8d39 100644 --- a/source/__main__.py +++ b/botbot/__main__.py @@ -2,7 +2,7 @@ from sys import executable, argv from traceback import print_exc from time import sleep -from botbot.main import get_args +from .main import get_args restart_delay_after_error = 10 @@ -12,9 +12,9 @@ def main(): try: if call([executable, '-m', 'botbot.main'] + argv[1:]) != 0: sleep(restart_delay_after_error) - except: + except Exception: print_exc() sleep(restart_delay_after_error) if __name__ == '__main__': - main(); + main() diff --git a/source/agentid_room.py b/botbot/agentid_room.py similarity index 100% rename from source/agentid_room.py rename to botbot/agentid_room.py diff --git a/source/botbot.py b/botbot/botbot.py similarity index 97% rename from source/botbot.py rename to botbot/botbot.py index 0872b46..375b9d8 100644 --- a/source/botbot.py +++ b/botbot/botbot.py @@ -9,14 +9,14 @@ #Additional modules import euphoria as eu -from botbot.euphutils import EuphUtils +from .euphutils import EuphUtils #Project modules -import botbot.logger as logger -import botbot.agentid_room as agentid_room -import botbot.longmessage_room as longmessage_room -from botbot.botcollection import BotCollection -from botbot.snapshot import Snapshot +from . import logger +from . import agentid_room +from . import longmessage_room +from .botcollection import BotCollection +from .snapshot import Snapshot log = logger.Logger() diff --git a/source/botbotbot.py b/botbot/botbotbot.py similarity index 98% rename from source/botbotbot.py rename to botbot/botbotbot.py index b0fbdfd..abf090d 100644 --- a/source/botbotbot.py +++ b/botbot/botbotbot.py @@ -1,7 +1,7 @@ -from botbot.euphutils import EuphUtils -from botbot.snapshot import Snapshot -import botbot.agentid_room as agentid_room -import botbot.longmessage_room as longmessage_room +from .euphutils import EuphUtils +from .snapshot import Snapshot +from . import agentid_room +from . import longmessage_room import euphoria as eu import time @@ -9,6 +9,7 @@ import uuid as uuid_module import errno import os +import traceback spam_threshold_messages = 10 spam_threshold_time = 5 diff --git a/source/botcollection.py b/botbot/botcollection.py similarity index 96% rename from source/botcollection.py rename to botbot/botcollection.py index f227e64..739bfa0 100644 --- a/source/botcollection.py +++ b/botbot/botcollection.py @@ -1,6 +1,6 @@ -from botbot.euphutils import EuphUtils -from botbot.botparser import Parser -from botbot.botbotbot import BotBotBot +from .euphutils import EuphUtils +from .botparser import Parser +from .botbotbot import BotBotBot import euphoria as eu import threading diff --git a/source/botparser.py b/botbot/botparser.py similarity index 99% rename from source/botparser.py rename to botbot/botparser.py index 52e77ab..ec072e1 100644 --- a/source/botparser.py +++ b/botbot/botparser.py @@ -7,9 +7,9 @@ import time import json from simpleeval import SimpleEval, DEFAULT_OPERATORS, DEFAULT_FUNCTIONS, DEFAULT_NAMES -from botbot.euphutils import EuphUtils +from .euphutils import EuphUtils -import botbot.logger as logger +from . import logger log = logger.Logger() diff --git a/source/euphutils.py b/botbot/euphutils.py similarity index 100% rename from source/euphutils.py rename to botbot/euphutils.py diff --git a/source/logger.py b/botbot/logger.py similarity index 100% rename from source/logger.py rename to botbot/logger.py diff --git a/source/longmessage_room.py b/botbot/longmessage_room.py similarity index 100% rename from source/longmessage_room.py rename to botbot/longmessage_room.py diff --git a/source/main.py b/botbot/main.py similarity index 97% rename from source/main.py rename to botbot/main.py index 803af1c..7e3a382 100644 --- a/source/main.py +++ b/botbot/main.py @@ -5,9 +5,9 @@ import euphoria as eu -from botbot.botbot import BotBot -from botbot.euphutils import EuphUtils -from botbot.snapshot import Snapshot +from .botbot import BotBot +from .euphutils import EuphUtils +from .snapshot import Snapshot room_name = 'testing' password = None diff --git a/source/snapshot.py b/botbot/snapshot.py similarity index 99% rename from source/snapshot.py rename to botbot/snapshot.py index d7583dd..60fafed 100644 --- a/source/snapshot.py +++ b/botbot/snapshot.py @@ -6,7 +6,7 @@ import shutil import time -import botbot.logger as logger +from . import logger log = logger.Logger() diff --git a/setup.py b/setup.py index ddcbcce..644fb56 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,6 @@ url='https://github.com/ArkaneMoose/BotBot', license='MIT', packages=['botbot'], - package_dir={'botbot': 'source'}, install_requires=['eupy >=1.2, <2.0', 'simpleeval >=0.9, <0.10'], dependency_links=['git+https://github.com/ArkaneMoose/EuPy.git@75777c49503acb32e09f4c36f6f65cc35157694a#egg=eupy-1.2', 'git+https://github.com/ArkaneMoose/simpleeval.git@ac33b805645ca616f11e64bb3330a12bc5fba658#egg=simpleeval-0.9.2'], entry_points={