diff --git a/api/__init__.py b/api/__init__.py index ebef729..e566c75 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -2,7 +2,7 @@ from .project import list_project, have_project, create_project, delete_project from .project import is_project_open, get_project_open_count, open_project, close_project from .project import copy_project -from .parser import read_inp, dump_inp, import_inp, export_inp +from .inp_io import read_inp, dump_inp, import_inp, export_inp from .database import API_ADD, API_UPDATE, API_DELETE from .database import ChangeSet diff --git a/api/parser.py b/api/inp_io.py similarity index 100% rename from api/parser.py rename to api/inp_io.py diff --git a/epanet/epanet2.py b/epanet/epanet2.py index 5f59584..bd21263 100644 --- a/epanet/epanet2.py +++ b/epanet/epanet2.py @@ -6,8 +6,8 @@ import json from typing import Any sys.path.append("..") from api import project -from api import parser -from .epanet2_ec import * +from api import inp_io + def _verify_platform(): _platform = platform.system() @@ -234,7 +234,7 @@ def run_project(name: str) -> str: dir = os.path.abspath(os.getcwd()) db_inp = os.path.join(os.path.join(dir, 'db_inp'), name + '.db.inp') - parser.dump_inp(name, db_inp) + inp_io.dump_inp(name, db_inp) input = name + '.db' exe = os.path.join(os.path.join(dir, 'epanet'), 'runepanet.exe')