Skip to content

Commit

Permalink
Sort imports
Browse files Browse the repository at this point in the history
  • Loading branch information
soaressgabriel committed Jun 30, 2021
1 parent 5e2996a commit 5a12cf6
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 21 deletions.
3 changes: 2 additions & 1 deletion help/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
# All configuration values have a default; values that are commented out
# serve to show the default.

import sys, os
import os
import sys

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
Expand Down
4 changes: 2 additions & 2 deletions rubem_hydrological.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
import os

try:
from qgis.PyQt.QtCore import QSettings, QTranslator, QCoreApplication, Qt
from qgis.PyQt.QtCore import QCoreApplication, QSettings, Qt, QTranslator
from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtWidgets import QAction
except ImportError:
from PyQt5.QtCore import QSettings, QTranslator, QCoreApplication, Qt
from PyQt5.QtCore import QCoreApplication, QSettings, Qt, QTranslator
from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QAction

Expand Down
10 changes: 5 additions & 5 deletions rubem_hydrological_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,28 @@
__date__ = "2021-05-19"
__version__ = "1.3.2"

import configparser
import os
from glob import glob
from pathlib import Path
import configparser

from PyQt5.QtWidgets import QMessageBox

try:
from qgis.PyQt.QtCore import QDate, QThread
from qgis.PyQt.QtWidgets import QDialog, QFileDialog
from qgis.PyQt.QtCore import QThread, QDate
except ImportError:
from PyQt5.QtCore import QDate, QThread
from PyQt5.QtWidgets import QDialog, QFileDialog
from PyQt5.QtCore import QThread, QDate

try:
from .rubem_config import *
from .rubem_hydrological_dialog_base_ui import Ui_RUBEMHydrological
from .rubem_thread_workers import RUBEMStandaloneWorker
from .rubem_config import *
except ImportError:
from rubem_config import *
from rubem_hydrological_dialog_base_ui import Ui_RUBEMHydrological
from rubem_thread_workers import RUBEMStandaloneWorker
from rubem_config import *


class RUBEMHydrologicalDialog(QDialog, Ui_RUBEMHydrological):
Expand Down
2 changes: 1 addition & 1 deletion rubem_thread_workers.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
__date__ = "2021-05-19"
__version__ = "1.3.2"

from subprocess import Popen, TimeoutExpired, PIPE
from subprocess import PIPE, Popen, TimeoutExpired

try:
from qgis.PyQt.QtCore import QObject, pyqtSignal
Expand Down
3 changes: 2 additions & 1 deletion test/qgis_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
)

import logging
from qgis.PyQt.QtCore import QObject, pyqtSlot, pyqtSignal

from qgis.core import QgsMapLayerRegistry
from qgis.gui import QgsMapCanvasLayer
from qgis.PyQt.QtCore import QObject, pyqtSignal, pyqtSlot

LOGGER = logging.getLogger("QGIS")

Expand Down
4 changes: 2 additions & 2 deletions test/test_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
__copyright__ = "Copyright 2012, Australia Indonesia Facility for "
__copyright__ += "Disaster Reduction"

import configparser
import logging
import os
import unittest
import logging
import configparser

LOGGER = logging.getLogger("QGIS")

Expand Down
5 changes: 3 additions & 2 deletions test/test_qgis_environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@

import os
import unittest
from qgis.core import QgsProviderRegistry, QgsCoordinateReferenceSystem, QgsRasterLayer

from test.utilities import get_qgis_app

from qgis.core import (QgsCoordinateReferenceSystem, QgsProviderRegistry,
QgsRasterLayer)

QGIS_APP = get_qgis_app()


Expand Down
5 changes: 2 additions & 3 deletions test/test_rubem_hydrological_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@
__copyright__ = "Copyright 2021, LabSid"

import unittest
from test.utilities import get_qgis_app

from qgis.PyQt.QtWidgets import QDialogButtonBox, QDialog
from qgis.PyQt.QtWidgets import QDialog, QDialogButtonBox

from rubem_hydrological_dialog import RUBEMHydrologicalDialog

from test.utilities import get_qgis_app

QGIS_APP = get_qgis_app()


Expand Down
2 changes: 1 addition & 1 deletion test/test_translations.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
__author__ = "ismailsunni@yahoo.co.id"
__date__ = "12/10/2011"
__copyright__ = "Copyright 2012, Australia Indonesia Facility for " "Disaster Reduction"
import unittest
import os
import unittest

from qgis.PyQt.QtCore import QCoreApplication, QTranslator

Expand Down
6 changes: 3 additions & 3 deletions test/utilities.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# coding=utf-8
"""Common functionality used by regression tests."""

import sys
import logging

import sys

LOGGER = logging.getLogger("QGIS")
QGIS_APP = None # Static variable used to hold hand to running QGIS app
Expand All @@ -23,9 +22,10 @@ def get_qgis_app():
"""

try:
from qgis.PyQt import QtGui, QtCore
from qgis.core import QgsApplication
from qgis.gui import QgsMapCanvas
from qgis.PyQt import QtCore, QtGui

from .qgis_interface import QgisInterface
except ImportError:
return None, None, None, None
Expand Down

0 comments on commit 5a12cf6

Please sign in to comment.