From 809ce6522ba0937c82737195d69ac00c3b2d965b Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sun, 3 Apr 2022 04:02:08 +0200 Subject: [PATCH 1/2] fix(backend/mysql): load files through importlib is required since package will be distributed as python egg --- src/httpaste/backend/mysql/paste.py | 4 +++- src/httpaste/backend/mysql/user.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/httpaste/backend/mysql/paste.py b/src/httpaste/backend/mysql/paste.py index 5e4057f..efa5f0e 100644 --- a/src/httpaste/backend/mysql/paste.py +++ b/src/httpaste/backend/mysql/paste.py @@ -1,5 +1,7 @@ from os import path from time import time +from importlib.resources import open_text + try: from mysql.connector.connection import MySQLConnection @@ -92,7 +94,7 @@ def init(connection: MySQLConnection): cursor = connection.cursor() - with open(path.join(path.dirname(__file__), 'paste.sql'), 'r') as fh: + with open_text('httpaste.backend.mysql', 'paste.sql') as fh: cursor.execute(fh.read()) diff --git a/src/httpaste/backend/mysql/user.py b/src/httpaste/backend/mysql/user.py index 7efebfc..a7148ff 100644 --- a/src/httpaste/backend/mysql/user.py +++ b/src/httpaste/backend/mysql/user.py @@ -1,4 +1,5 @@ from os import path +from importlib.resources import open_text try: from mysql.connector.connection import MySQLConnection except ImportError as e: @@ -83,7 +84,7 @@ def init(connection: MySQLConnection): cursor = connection.cursor() - with open(path.join(path.dirname(__file__), 'user.sql'), 'r') as fh: + with open_text('httpaste.backend.mysql', 'user.sql') as fh: cursor.execute(fh.read()) From d8ac419c180230e55948769cee2dfc1b793e706a Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sun, 3 Apr 2022 04:04:56 +0200 Subject: [PATCH 2/2] fix(backend/mysql): add missing var for get_connection() --- src/httpaste/backend/__init__.py | 2 +- src/httpaste/backend/mysql/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/httpaste/backend/__init__.py b/src/httpaste/backend/__init__.py index 60800b1..67f1c8c 100644 --- a/src/httpaste/backend/__init__.py +++ b/src/httpaste/backend/__init__.py @@ -60,7 +60,7 @@ class MySQL(Backend): def __init__(self, parameters: MySQLParameters): - parameters = MySQLParameters(*parameters[1:], get_mysql_connection(parameters)) + #parameters = MySQLParameters(*parameters[1:], get_mysql_connection(parameters)) self.user = MySQLUser(parameters, User) self.paste = MySQLPaste(parameters, Paste) diff --git a/src/httpaste/backend/mysql/__init__.py b/src/httpaste/backend/mysql/__init__.py index abda80c..e4b0b5c 100644 --- a/src/httpaste/backend/mysql/__init__.py +++ b/src/httpaste/backend/mysql/__init__.py @@ -35,7 +35,7 @@ class User(object): self.model_class = model_class - self.connection = get_connection(parameters) + self.connection = get_connection(parameters, connect) def load(self, proto: object) -> object: @@ -112,7 +112,7 @@ def get_mysql_connect_callee() -> object: return connect -def get_connection(parameters: Parameters, connect_callee: Callable) -> object: +def get_connection(parameters: Parameters, connect: Callable) -> object: """get a mysql.connection.MySQLConnection object """