diff --git a/datamodel/app/extensions/demo_extension/002_demo.py b/datamodel/app/extensions/demo_extension/002_demo.py index 4c64ff0c9..74347dd57 100644 --- a/datamodel/app/extensions/demo_extension/002_demo.py +++ b/datamodel/app/extensions/demo_extension/002_demo.py @@ -1,7 +1,4 @@ -import argparse - - -def demo(myVariable,myNumber): +def demo(myVariable, myNumber): print(f"{myVariable}! My favorite number is {myNumber}") diff --git a/datamodel/app/extensions/extension_manager.py b/datamodel/app/extensions/extension_manager.py index 2cdd05607..68caaa59a 100644 --- a/datamodel/app/extensions/extension_manager.py +++ b/datamodel/app/extensions/extension_manager.py @@ -26,7 +26,7 @@ def run_py_file(file_path: str, variables: dict = None): abs_file_path = Path(__file__).parent.resolve() / file_path varlist = [sys.executable, str(abs_file_path)] for key, value in variables.iteritems(): - varlist.append("--"+key) + varlist.append("--" + key) varlist.append(value) result = subprocess.run(varlist, capture_output=True, text=True) if result.returncode != 0: @@ -88,7 +88,7 @@ def load_extension( run_sql_file(os.path.join(directory, filename), pg_service, variables) if filename.endswith(".py"): print(f"Running {filename}") - run_py_file(os.path.join(directory, filename),variables) + run_py_file(os.path.join(directory, filename), variables) # re-create symbology triggers conn = psycopg.connect(f"service={pg_service}") diff --git a/plugin/teksi_wastewater/interlis/interlis_importer_exporter.py b/plugin/teksi_wastewater/interlis/interlis_importer_exporter.py index dca0974cc..aab279ad7 100644 --- a/plugin/teksi_wastewater/interlis/interlis_importer_exporter.py +++ b/plugin/teksi_wastewater/interlis/interlis_importer_exporter.py @@ -1,6 +1,7 @@ import logging import os import tempfile +from pathlib import Path from PyQt5.QtCore import Qt from PyQt5.QtWidgets import QApplication @@ -27,7 +28,6 @@ from .interlis_model_mapping.model_tww_od import ModelTwwOd from .utils.ili2db import InterlisTools from .utils.various import CmdException, LoggingHandlerContext, logger, make_log_path -from pathlib import Path class InterlisImporterExporterStopped(Exception): @@ -315,8 +315,12 @@ def _import_enable_symbology_triggers(self): DatabaseUtils.update_symbology() def _export_labels_file( - self, limit_to_selection, selected_labels_scales_indices, labels_file_path, export_model, - export_orientation=90.0 + self, + limit_to_selection, + selected_labels_scales_indices, + labels_file_path, + export_model, + export_orientation=90.0, ): try: # We only import now to avoid useless exception if dependencies aren't met diff --git a/plugin/teksi_wastewater/interlis/interlis_model_mapping/model_tww_ag6496.py b/plugin/teksi_wastewater/interlis/interlis_model_mapping/model_tww_ag6496.py index 0096b72a3..fd377009a 100644 --- a/plugin/teksi_wastewater/interlis/interlis_model_mapping/model_tww_ag6496.py +++ b/plugin/teksi_wastewater/interlis/interlis_model_mapping/model_tww_ag6496.py @@ -1,5 +1,5 @@ from geoalchemy2 import Geometry -from sqlalchemy import Column, DateTime, Float, Integer, String, Boolean +from sqlalchemy import Boolean, Column, DateTime, Float, Integer, String from .. import config from .model_base import ModelBase