From 8eeefc84dc8c0f06229133f76543d5b2a88252f3 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 16 Jul 2024 17:23:03 -0500 Subject: [PATCH] Move core utility functions into a separate module --- src/pgwui_upload/views/upload.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pgwui_upload/views/upload.py b/src/pgwui_upload/views/upload.py index 36f195d..eb6f512 100644 --- a/src/pgwui_upload/views/upload.py +++ b/src/pgwui_upload/views/upload.py @@ -30,6 +30,7 @@ import psycopg from pyramid.view import view_config import logging +import pgwui_core.utils from pgwui_common.view import auth_base_view from pgwui_core import exceptions as core_ex from pgwui_core.core import ( @@ -39,8 +40,6 @@ from pgwui_core.core import ( ParameterExecutor, UploadDoubleTableForm, UploadData, - escape_eol, - is_checked, ) from pgwui_upload_core.views.upload import ( UploadCoreInitialPost, @@ -157,7 +156,7 @@ class TableUploadHandler(BaseTableUploadHandler): def log_success(response): - if is_checked(response['csv_checked']): + if pgwui_core.utils.is_checked(response['csv_checked']): upload_fmt = 'CSV' else: upload_fmt = 'TAB' @@ -168,9 +167,10 @@ def log_success(response): .format(filename=response['filename'], lines=response['lines'], format=upload_fmt, - null=is_checked(response['upload_null']), - null_rep=escape_eol(response['null_rep']), - trim=is_checked(response['trim_upload']), + null=pgwui_core.utils.is_checked(response['upload_null']), + null_rep=pgwui_core.utils.escape_eol( + response['null_rep']), + trim=pgwui_core.utils.is_checked(response['trim_upload']), db=response['db'], table=response['table'], user=response['user'])) -- 2.34.1