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

@@ -9,6 +9,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
+venv/
 build/
 develop-eggs/
 dist/

source/__main__.py → 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()

source/botbot.py → 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()
 

source/botbotbot.py → botbot/botbotbot.py

@@ -1,14 +1,15 @@
-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
 import re
 import uuid as uuid_module
 import errno
 import os
+import traceback
 
 spam_threshold_messages = 10
 spam_threshold_time = 5

source/botcollection.py → 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

source/botparser.py → 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()
 

source/main.py → 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

source/snapshot.py → botbot/snapshot.py

@@ -6,7 +6,7 @@
 import shutil
 import time
 
-import botbot.logger as logger
+from . import logger
 
 log = logger.Logger()
 

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={