diff --git a/setup.cfg b/setup.cfg index 8c8ebc5..62ebeae 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = httpaste-victorykit -version = 1.0.4-alpha +version = 1.0.5-alpha author = Tiara Rodney author_email = t.rodney@victoryk.it description = a versatile HTTP pastebin @@ -39,4 +39,5 @@ console_scripts = where = src [options.package_data] -schema = src/httpaste/schema/httpaste.openapi.json +openapi_schema = src/httpaste/schema/httpaste.openapi.json +sql_schema = *.sql diff --git a/src/httpaste/__main__.py b/src/httpaste/__main__.py index 436a46c..ec35404 100644 --- a/src/httpaste/__main__.py +++ b/src/httpaste/__main__.py @@ -2,6 +2,7 @@ """ import argparse import os +from importlib.resources import open_text def _this_dir(basename: str) -> str: @@ -20,7 +21,7 @@ def _path_output(path, echo: bool = False) -> str: return path else: - with open(path, 'r') as fh: + with open_text('httpaste', path) as fh: return fh.read() @@ -51,21 +52,21 @@ def command_wsgi(**kwargs): """get WSGI script """ - print(_path_output(_this_dir('wsgi.py'), kwargs.get('echo'))) + print(_path_output('wsgi.py', kwargs.get('echo'))) def command_cgi(**kwargs): """get CGI script """ - print(_path_output(_this_dir('cgi.py'), kwargs.get('echo'))) + print(_path_output('cgi.py', kwargs.get('echo'))) def command_fcgi(**kwargs): """get FastCGI script """ - print(_path_output(_this_dir('fcgi.py'), kwargs.get('echo'))) + print(_path_output('fcgi.py', kwargs.get('echo'))) def command_default_config(**kwargs): diff --git a/src/httpaste/backend/sqlite/paste.py b/src/httpaste/backend/sqlite/paste.py index bb0eb17..51c9fc6 100644 --- a/src/httpaste/backend/sqlite/paste.py +++ b/src/httpaste/backend/sqlite/paste.py @@ -3,6 +3,7 @@ from os import path from sqlite3 import Connection from time import time +from importlib.resources import open_text def load(proto: object, connection: Connection, model_class: type): @@ -63,7 +64,7 @@ def init(connection: Connection): cur = connection.cursor() - with open(path.join(path.dirname(__file__), 'paste.sql'), 'r') as fh: + with open_text('httpaste.backend.sqlite', 'paste.sql') as fh: cur.execute(fh.read()) diff --git a/src/httpaste/backend/sqlite/user.py b/src/httpaste/backend/sqlite/user.py index 11fc53e..e4f712d 100644 --- a/src/httpaste/backend/sqlite/user.py +++ b/src/httpaste/backend/sqlite/user.py @@ -3,6 +3,7 @@ from os import path from sqlite3 import Connection from httpaste.model import User +from importlib.resources import open_text def load(proto: User, connection: Connection): @@ -48,7 +49,7 @@ def init(connection: Connection): cur = connection.cursor() - with open(path.join(path.dirname(__file__), 'user.sql'), 'r') as fh: + with open_text('httpaste.backend.sqlite', 'user.sql') as fh: cur.execute(fh.read())