From 0eb42567d27621f296e9972dd92c7135b354a616 Mon Sep 17 00:00:00 2001 From: wqy Date: Sat, 3 Sep 2022 01:07:04 +0800 Subject: [PATCH] Format package --- api/__init__.py | 24 ++++++++++++------------ api/operation.py | 2 +- api/project.py | 2 +- api/s0_base.py | 2 +- api/s1_title.py | 4 ++-- api/s2_junctions.py | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api/__init__.py b/api/__init__.py index 2912787..b3e9439 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -1,16 +1,16 @@ -from project import have_project, create_project, delete_project -from project import is_project_open, open_project, close_project +from .project import have_project, create_project, delete_project +from .project import is_project_open, open_project, close_project -from operation import execute_undo as undo -from operation import execute_redo as redo +from .operation import execute_undo as undo +from .operation import execute_redo as redo -from s0_base import is_node, is_junction, is_reservoir, is_tank -from s0_base import is_link, is_pipe, is_pump, is_valve -from s0_base import is_curve -from s0_base import is_pattern +from .s0_base import is_node, is_junction, is_reservoir, is_tank +from .s0_base import is_link, is_pipe, is_pump, is_valve +from .s0_base import is_curve +from .s0_base import is_pattern -from s1_title import set_title, get_title +from .s1_title import set_title, get_title -from s2_junctions import add_junction, delete_junction -from s2_junctions import get_junction_elevation, get_junction_demand, get_junction_pattern, get_junction_coord -from s2_junctions import set_junction_elevation, set_junction_demand, set_junction_pattern, set_junction_coord \ No newline at end of file +from .s2_junctions import add_junction, delete_junction +from .s2_junctions import get_junction_elevation, get_junction_demand, get_junction_pattern, get_junction_coord +from .s2_junctions import set_junction_elevation, set_junction_demand, set_junction_pattern, set_junction_coord \ No newline at end of file diff --git a/api/operation.py b/api/operation.py index 2ef9e56..6a5536c 100644 --- a/api/operation.py +++ b/api/operation.py @@ -1,5 +1,5 @@ from psycopg.rows import dict_row -from connection import g_conn_dict as conn +from .connection import g_conn_dict as conn def _get_current_operation(name: str) -> int: with conn[name].cursor(row_factory=dict_row) as cur: diff --git a/api/project.py b/api/project.py index 3fa1b83..b82782a 100644 --- a/api/project.py +++ b/api/project.py @@ -1,5 +1,5 @@ import psycopg as pg -from connection import g_conn_dict as conn +from .connection import g_conn_dict as conn # no undo/redo diff --git a/api/s0_base.py b/api/s0_base.py index bbefa7b..91e999d 100644 --- a/api/s0_base.py +++ b/api/s0_base.py @@ -1,5 +1,5 @@ from psycopg.rows import dict_row, Row -from connection import g_conn_dict as conn +from .connection import g_conn_dict as conn _NODE = "_node" _LINK = "_link" diff --git a/api/s1_title.py b/api/s1_title.py index 7a322cd..2f086c1 100644 --- a/api/s1_title.py +++ b/api/s1_title.py @@ -1,6 +1,6 @@ from psycopg.rows import dict_row -from operation import * -from connection import g_conn_dict as conn +from .operation import * +from .connection import g_conn_dict as conn def get_title(name: str) -> str: with conn[name].cursor(row_factory=dict_row) as cur: diff --git a/api/s2_junctions.py b/api/s2_junctions.py index af140c6..79301ce 100644 --- a/api/s2_junctions.py +++ b/api/s2_junctions.py @@ -1,7 +1,7 @@ from psycopg.rows import dict_row, Row -from connection import g_conn_dict as conn -from s0_base import * -from operation import * +from .connection import g_conn_dict as conn +from .s0_base import * +from .operation import * def add_junction(name: str, id: str, x: float, y: float, elevation: float) -> None: if is_node(name, id):