From 74927c9d026b09430a2feace49c7b25b12a69b1f Mon Sep 17 00:00:00 2001 From: Kumi Date: Mon, 8 Aug 2022 10:03:51 +0000 Subject: [PATCH] Use relative imports --- pyproject.toml | 2 +- src/reportmonster/classes/config.py | 4 ++-- src/reportmonster/classes/database.py | 2 +- src/reportmonster/classes/user.py | 5 ++--- src/reportmonster/classes/vessel.py | 5 ++--- src/reportmonster/reports/__init__.py | 0 src/reportmonster/runreport.py | 16 ---------------- src/reportmonster/server.py | 2 +- 8 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 src/reportmonster/reports/__init__.py delete mode 100644 src/reportmonster/runreport.py diff --git a/pyproject.toml b/pyproject.toml index 55d8d57..77b03ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "reportmonster" -version = "0.9.1" +version = "0.9.2" authors = [ { name="Kumi Systems e.U.", email="office@kumi.systems" }, ] diff --git a/src/reportmonster/classes/config.py b/src/reportmonster/classes/config.py index 7cb3d88..e85eea5 100644 --- a/src/reportmonster/classes/config.py +++ b/src/reportmonster/classes/config.py @@ -3,8 +3,8 @@ import configparser from pathlib import Path from typing import Union -from classes.vessel import Vessel -from classes.user import User +from .vessel import Vessel +from .user import User class MonsterConfig: diff --git a/src/reportmonster/classes/database.py b/src/reportmonster/classes/database.py index 001e337..97f6105 100644 --- a/src/reportmonster/classes/database.py +++ b/src/reportmonster/classes/database.py @@ -3,7 +3,7 @@ import MySQLdb.cursors from typing import Union, Optional -from classes.connection import Connection +from .connection import Connection class Database: diff --git a/src/reportmonster/classes/user.py b/src/reportmonster/classes/user.py index aa7f5e2..7b755c0 100644 --- a/src/reportmonster/classes/user.py +++ b/src/reportmonster/classes/user.py @@ -1,4 +1,5 @@ -from classes.database import Database +from .database import Database +from ..const import * from configparser import SectionProxy from typing import Optional, Union @@ -7,8 +8,6 @@ from datetime import datetime from MySQLdb.cursors import DictCursor from bcrypt import hashpw, gensalt -from const import * - class User: """Class describing a User diff --git a/src/reportmonster/classes/vessel.py b/src/reportmonster/classes/vessel.py index 36ef3d6..985a361 100644 --- a/src/reportmonster/classes/vessel.py +++ b/src/reportmonster/classes/vessel.py @@ -1,4 +1,5 @@ -from classes.database import Database +from .database import Database +from ..const import * from configparser import SectionProxy from typing import Optional, Union @@ -7,8 +8,6 @@ from datetime import datetime from MySQLdb.cursors import DictCursor from bcrypt import hashpw, gensalt -from const import * - class Vessel: """Class describing a Vessel diff --git a/src/reportmonster/reports/__init__.py b/src/reportmonster/reports/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/reportmonster/runreport.py b/src/reportmonster/runreport.py deleted file mode 100644 index 1f78ebb..0000000 --- a/src/reportmonster/runreport.py +++ /dev/null @@ -1,16 +0,0 @@ -import argparse -import importlib -import sys - -parser = argparse.ArgumentParser(description='Run a specified report') - -parser.add_argument('report') #, type=str, help='name of the report to execute') - -args = parser.parse_args() - -sys.argv = sys.argv[1:] - -try: - importlib.import_module("reports.%s" % args.report) -except ImportError as e: - print("Error: Could not import %s: %s" % (args.report, str(e))) diff --git a/src/reportmonster/server.py b/src/reportmonster/server.py index ffdfea5..6116024 100644 --- a/src/reportmonster/server.py +++ b/src/reportmonster/server.py @@ -5,7 +5,7 @@ import time import pathlib import json -from classes.config import MonsterConfig +from .classes.config import MonsterConfig class ReportMonsterHandler(socketserver.BaseRequestHandler):