Fix rebasing from master

Author: dmarteau

lizmap/dialogs/main.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from qgis.core import (
     Qgis,
@@ -25,6 +25,7 @@
     QPushButton,
     QSizePolicy,
     QSpacerItem,
+    QWidget,
 )
 from qgis.utils import OverrideCursor, iface
 
@@ -92,9 +93,6 @@
         WEB_ENGINE = False
         WEBKIT_AVAILABLE = False
 
-if TYPE_CHECKING:
-    from qgis.PyQt.QtWidgets import QWidget
-
 
 FORM_CLASS = load_ui('ui_lizmap.ui')
 

lizmap/dialogs/server_wizard.py

@@ -5,7 +5,6 @@
 from base64 import b64encode
 from enum import IntEnum, auto
 from functools import partial
-from typing import TYPE_CHECKING
 
 from qgis.core import (
     Qgis,
@@ -39,6 +38,7 @@
     QSpacerItem,
     QSpinBox,
     QVBoxLayout,
+    QWidget,
     QWizard,
     QWizardPage,
 )
@@ -54,10 +54,6 @@
 from ..toolbelt.plugin import lizmap_user_folder, user_settings
 from ..toolbelt.version import version
 
-if TYPE_CHECKING:
-    from qgis.PyQt.QtWidgets import QWidget
-
-
 THUMBS = " 👍"
 DEBUG = True
 

lizmap/drag_drop_dataviz_manager.py

@@ -1,5 +1,4 @@
 from enum import Enum, unique
-from typing import TYPE_CHECKING
 
 from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtGui import QBrush, QIcon
@@ -16,11 +15,10 @@
 )
 
 from . import logger
+from .definitions.dataviz import DatavizDefinitions
 from .toolbelt.i18n import tr
 from .toolbelt.resources import resources_path
 
-if TYPE_CHECKING:
-    from lizmap.definitions.dataviz import DatavizDefinitions
 
 @unique
 class Container(Enum):

lizmap/plugin/core.py

@@ -3,13 +3,6 @@
 
 from functools import partial
 from os.path import relpath
-from pathlib import Path
-
-from typing import (
-    TYPE_CHECKING,
-    Dict,
-    Optional,
-)
 
 from qgis.core import (
     Qgis,
@@ -23,6 +16,7 @@
     QgsSettings,
     QgsVectorLayer,
 )
+from qgis.gui import QgisInterface
 from qgis.PyQt.QtCore import (
     QCoreApplication,
     Qt,
@@ -141,11 +135,6 @@
 from .training import TrainingManager
 from .webdav import WebDavManager
 
-if TYPE_CHECKING:
-    from qgis.gui import QgisInterface
-
-from . import helpers
-
 VERSION_URL = "https://raw.githubusercontent.com/3liz/lizmap-web-client/versions/versions.json"
 # To try a local file
 # VERSION_URL = 'file:///home/etienne/.local/share/QGIS/QGIS3/profiles/default/Lizmap/released_versions.json'
@@ -531,31 +520,6 @@ def __init__(self, iface: QgisInterface, lwc_version: LwcVersions = None):
         self.help_action_cloud = None
 
     def configure_dev_version(self):
-        # File handler for logging
-        temp_dir = Path(tempfile.gettempdir()).joinpath("QGIS_Lizmap")
-        if not temp_dir.exists():
-            temp_dir.mkdir()
-
-        if not as_boolean(os.getenv("CI")):
-            file_handler = logging.FileHandler(temp_dir.joinpath("lizmap.log"))
-            file_handler.setLevel(logging.DEBUG)
-            formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-            file_handler.setFormatter(formatter)
-            add_logging_handler_once(LOGGER, file_handler)
-            LOGGER.debug(
-                f"The directory <a href='file://{temp_dir}'>{temp_dir}</a> "
-                "is currently used for file logging."
-            )
-
-        # All logs
-        def write_log_message(message, tag, level):
-            """Write all tabs from QGIS to files."""
-            temp_dir_log = Path(tempfile.gettempdir()).joinpath("QGIS_Lizmap")
-            with open(temp_dir_log.joinpath("all.log"), "a") as log_file:
-                log_file.write(f"{tag}({level}): {message}")
-
-        QgsApplication.messageLog().messageReceived.connect(write_log_message)
-
         self.dlg.setWindowTitle(
             f"Lizmap branch {self.version}, commit {current_git_hash()}, next {next_git_tag()}"
         )

lizmap/plugin/layer_tree.py

@@ -5,8 +5,8 @@
 import os
 
 from typing import (
-    TYPE_CHECKING,
     Any,
+    Optional,
     Protocol,
     Tuple,
 )
@@ -25,6 +25,7 @@
     QgsVectorLayer,
     QgsWkbTypes,
 )
+from qgis.gui import QgisInterface
 from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import (
@@ -33,6 +34,7 @@
 )
 
 from .. import logger
+from ..config import GlobalOptionsDefinitions, LayerOptionDefinitions
 from ..definitions.definitions import (
     DURATION_WARNING_BAR,
     GroupNames,
@@ -55,12 +57,6 @@
 )
 from .helpers import display_error, string_to_list
 
-if TYPE_CHECKING:
-    from qgis.gui import QgisInterface
-
-    from ..config import GlobalOptionsDefinitions, LayerOptionDefinitions
-    from ..dialogs.main import LizmapDialog
-
 
 class LizmapProtocol(Protocol):
     dlg: LizmapDialog

lizmap/server_dav.py

@@ -1,7 +1,6 @@
 from base64 import b64encode
 from collections import namedtuple
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 from qgis.core import (
     Qgis,
@@ -17,14 +16,11 @@
 
 from . import logger
 from .definitions.definitions import RepositoryComboData, ServerComboData
+from .dialogs.main import LizmapDialog
 from .saas import webdav_properties
 from .toolbelt.i18n import tr
 from .toolbelt.strings import path_to_url
 
-if TYPE_CHECKING:
-    from  .dialogs.main import LizmapDialog
-
-
 PropFindFileResponse = namedtuple(
     'PropFindFile',
     [

lizmap/server_lwc.py

@@ -6,7 +6,6 @@
 from functools import partial
 from pathlib import Path
 from typing import (
-    TYPE_CHECKING,
     Callable,
 )
 
@@ -40,29 +39,26 @@
     QWidget,
 )
 
-from lizmap.definitions.definitions import (
+from . import logger
+from .definitions.definitions import (
     DEV_VERSION_PREFIX,
     UNSTABLE_VERSION_PREFIX,
     ReleaseStatus,
     ServerComboData,
 )
-from lizmap.definitions.lizmap_cloud import CLOUD_QGIS_MIN_RECOMMENDED
-from lizmap.dialogs.server_wizard import (
+from .definitions.lizmap_cloud import CLOUD_QGIS_MIN_RECOMMENDED
+from .dialogs.main import LizmapDialog
+from .dialogs.server_wizard import (
     CreateFolderWizard,
     NamePage,
     ServerWizard,
 )
-
-from . import logger
 from .saas import is_lizmap_cloud, webdav_properties
 from .toolbelt.convert import ambiguous_to_bool
 from .toolbelt.i18n import tr
 from .toolbelt.plugin import lizmap_user_folder, user_settings
 from .toolbelt.version import qgis_version_info, version
 
-if TYPE_CHECKING:
-    from .dialogs.main import LizmapDialog
-
 
 class TableCell(Enum):
     """ Cells in the table. """

lizmap/table_manager/base.py

@@ -5,7 +5,6 @@
 import os
 
 from collections import namedtuple
-from typing import TYPE_CHECKING
 
 from qgis.core import QgsMapLayerModel, QgsMasterLayoutInterface, QgsProject
 from qgis.PyQt.QtCore import Qt
@@ -20,16 +19,18 @@
 )
 
 from .. import logger
-from ..definitions.base import BaseDefinitions, InputType
+from ..definitions.base import (
+    BaseDefinitions,
+    InputType,
+    InputTypeError,
+)
 from ..definitions.dataviz import AggregationType, GraphType
 from ..definitions.definitions import LwcVersions
+from ..dialogs.main import LizmapDialog
 from ..qt_style_sheets import NEW_FEATURE_CSS
 from ..toolbelt.convert import as_boolean
 from ..toolbelt.i18n import tr
 
-if TYPE_CHECKING:
-    from .dialogs.main import LizmapDialog
-
 
 class CellError(Exception):
     pass

lizmap/table_manager/dataviz.py

@@ -2,8 +2,6 @@
 
 import json
 
-from typing import TYPE_CHECKING
-
 from qgis.core import (
     QgsApplication,
     QgsAuthMethodConfig,
@@ -26,20 +24,17 @@
 from qgis.utils import OverrideCursor
 
 from .. import logger
+from ..definitions.base import BaseDefinitions
 from ..definitions.dataviz import GraphType
 from ..definitions.definitions import ServerComboData
+from ..dialogs.main import LizmapDialog
 from ..dialogs.server_wizard import ServerWizard
 from ..table_manager.base import TableManager
 from ..toolbelt.convert import as_boolean
 from ..toolbelt.i18n import tr
 from ..toolbelt.resources import resources_path
 from ..toolbelt.strings import merge_strings
 
-if TYPE_CHECKING:
-    from lizmap.definitions.base import BaseDefinitions
-    from lizmap.dialogs.main import LizmapDialog
-
-
 
 class TableManagerDataviz(TableManager):
 

lizmap/table_manager/layouts.py

@@ -1,18 +1,19 @@
 """ Table manager for layouts. """
 from enum import Enum
-from typing import TYPE_CHECKING
 
 from qgis.core import QgsMasterLayoutInterface, QgsProject
 from qgis.PyQt.QtCore import Qt
+from qgis.PyQt.QtWidgets import (
+    QAbstractButton,
+    QDialog,
+    QWidget,
+)
 
 from .. import logger
+from ..definitions.base import BaseDefinitions
 from ..definitions.definitions import LwcVersions
 from .base import TableManager
 
-if TYPE_CHECKING:
-    from qgis.PyQt.QtWidgets import QAbstractButton, QDialog, QWidget
-    from lizmap.definitions.base import BaseDefinitions
-
 
 class TableManagerLayouts(TableManager):