trivial: apply new isort configuration (#52504)

setup.py

@@ -9,8 +9,7 @@ from distutils.command.sdist import sdist
 from distutils.errors import CompileError
 from distutils.spawn import find_executable
 
-from setuptools import find_packages
+from setuptools import find_packages, setup
-from setuptools import setup
 from setuptools.command.install_lib import install_lib as _install_lib
 
 local_cfg = None

tests/admin_pages/test_all.py

@@ -3,10 +3,7 @@
 import os
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.ident.password_accounts import PasswordAccount

tests/admin_pages/test_api_access.py

@@ -15,10 +15,7 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs.api_access import ApiAccess
 from wcs.qommon.http_request import HTTPRequest

tests/admin_pages/test_block.py

@@ -8,10 +8,7 @@ except ImportError:
     lasso = None
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 from webtest import Upload
 
 from wcs import fields
@@ -19,8 +16,7 @@ from wcs.blocks import BlockDef
 from wcs.formdef import FormDef
 from wcs.qommon.http_request import HTTPRequest
 
-from .test_all import create_role
+from .test_all import create_role, create_superuser
-from .test_all import create_superuser
 
 
 def pytest_generate_tests(metafunc):

tests/admin_pages/test_card.py

@@ -3,10 +3,7 @@
 import re
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs import fields
 from wcs.admin.settings import UserFieldsFormDef
@@ -14,11 +11,8 @@ from wcs.carddef import CardDef
 from wcs.categories import CardDefCategory
 from wcs.formdef import FormDef
 from wcs.qommon.http_request import HTTPRequest
-from wcs.wf.form import FormWorkflowStatusItem
+from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-from wcs.wf.form import WorkflowFormFieldsFormDef
+from wcs.workflows import Workflow, WorkflowBackofficeFieldsFormDef, WorkflowVariablesFieldsFormDef
-from wcs.workflows import Workflow
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
-from wcs.workflows import WorkflowVariablesFieldsFormDef
 
 from .test_all import create_superuser
 

tests/admin_pages/test_carddefcategory.py

@@ -1,10 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs.carddef import CardDef
 from wcs.categories import CardDefCategory

tests/admin_pages/test_category.py

@@ -1,10 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs.categories import Category
 from wcs.formdef import FormDef

tests/admin_pages/test_datasource.py

@@ -13,11 +13,7 @@ except ImportError:
     lasso = None
 
 import pytest
-from utilities import HttpRequestsMocking
+from utilities import HttpRequestsMocking, clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import clean_temporary_pub
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 from webtest import Upload
 
 from wcs import fields
@@ -26,8 +22,7 @@ from wcs.carddef import CardDef
 from wcs.data_sources import NamedDataSource
 from wcs.formdef import FormDef
 from wcs.qommon.http_request import HTTPRequest
-from wcs.workflows import Workflow
+from wcs.workflows import Workflow, WorkflowBackofficeFieldsFormDef
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
 
 from .test_all import create_superuser
 
@@ -347,8 +342,7 @@ def test_data_sources_view(pub):
         fields.ItemField(id='1', type='item', label='item', data_source={'type': data_source.slug})
     )
 
-    from wcs.wf.form import FormWorkflowStatusItem
+    from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-    from wcs.wf.form import WorkflowFormFieldsFormDef
 
     baz_status = workflow.add_status(name='baz')
     display_form = FormWorkflowStatusItem()

tests/admin_pages/test_form.py

@@ -10,10 +10,7 @@ import xml.etree.ElementTree as ET
 
 import mock
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 from webtest import Upload
 
 from wcs import fields
@@ -26,8 +23,7 @@ from wcs.qommon.http_request import HTTPRequest
 from wcs.workflows import Workflow
 from wcs.wscalls import NamedWsCall
 
-from .test_all import create_role
+from .test_all import create_role, create_superuser
-from .test_all import create_superuser
 
 
 def pytest_generate_tests(metafunc):

tests/admin_pages/test_logged_errors.py

@@ -3,10 +3,7 @@
 import datetime
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs.carddef import CardDef
 from wcs.formdef import FormDef

tests/admin_pages/test_role.py

@@ -1,10 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs.formdef import FormDef
 from wcs.qommon.http_request import HTTPRequest

tests/admin_pages/test_settings.py

@@ -14,25 +14,20 @@ except ImportError:
 import mock
 import pytest
 from quixote.http_request import Upload as QuixoteUpload
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 from webtest import Upload
 
 from wcs import fields
 from wcs.api_access import ApiAccess
 from wcs.carddef import CardDef
-from wcs.categories import CardDefCategory
+from wcs.categories import CardDefCategory, Category
-from wcs.categories import Category
 from wcs.data_sources import NamedDataSource
 from wcs.formdef import FormDef
 from wcs.qommon.form import UploadedFile
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.template import get_current_theme
 from wcs.wf.export_to_model import ExportToModel
-from wcs.workflows import CommentableWorkflowStatusItem
+from wcs.workflows import CommentableWorkflowStatusItem, Workflow
-from wcs.workflows import Workflow
 from wcs.wscalls import NamedWsCall
 
 from .test_all import create_superuser

tests/admin_pages/test_user.py

@@ -1,18 +1,14 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs import fields
 from wcs.admin.settings import UserFieldsFormDef
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.ident.password_accounts import PasswordAccount
 
-from .test_all import create_role
+from .test_all import create_role, create_superuser
-from .test_all import create_superuser
 
 
 def pytest_generate_tests(metafunc):

tests/admin_pages/test_workflow.py

@@ -12,10 +12,7 @@ except ImportError:
     lasso = None
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 from webtest import Upload
 
 from wcs import fields
@@ -24,27 +21,27 @@ from wcs.formdef import FormDef
 from wcs.qommon.errors import ConnectionError
 from wcs.qommon.http_request import HTTPRequest
 from wcs.wf.create_carddata import CreateCarddataWorkflowStatusItem
-from wcs.wf.create_formdata import CreateFormdataWorkflowStatusItem
+from wcs.wf.create_formdata import CreateFormdataWorkflowStatusItem, Mapping
-from wcs.wf.create_formdata import Mapping
 from wcs.wf.dispatch import DispatchWorkflowStatusItem
 from wcs.wf.edit_carddata import EditCarddataWorkflowStatusItem
 from wcs.wf.export_to_model import ExportToModel
 from wcs.wf.external_workflow import ExternalWorkflowGlobalAction
-from wcs.wf.form import FormWorkflowStatusItem
+from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-from wcs.wf.form import WorkflowFormFieldsFormDef
 from wcs.wf.jump import JumpWorkflowStatusItem
 from wcs.wf.redirect_to_url import RedirectToUrlWorkflowStatusItem
 from wcs.wf.register_comment import RegisterCommenterWorkflowStatusItem
 from wcs.wf.wscall import WebserviceCallStatusItem
-from wcs.workflows import ChoiceWorkflowStatusItem
+from wcs.workflows import (
-from wcs.workflows import CommentableWorkflowStatusItem
+    ChoiceWorkflowStatusItem,
-from wcs.workflows import DisplayMessageWorkflowStatusItem
+    CommentableWorkflowStatusItem,
-from wcs.workflows import JumpOnSubmitWorkflowStatusItem
+    DisplayMessageWorkflowStatusItem,
-from wcs.workflows import Workflow
+    JumpOnSubmitWorkflowStatusItem,
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
+    Workflow,
-from wcs.workflows import WorkflowCriticalityLevel
+    WorkflowBackofficeFieldsFormDef,
-from wcs.workflows import WorkflowVariablesFieldsFormDef
+    WorkflowCriticalityLevel,
-from wcs.workflows import item_classes
+    WorkflowVariablesFieldsFormDef,
+    item_classes,
+)
 
 from .test_all import create_superuser
 

tests/admin_pages/test_wscall.py

@@ -4,10 +4,7 @@ import io
 import xml.etree.ElementTree as ET
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 from webtest import Upload
 
 from wcs.qommon.http_request import HTTPRequest

tests/api/test_access.py

@@ -11,14 +11,9 @@ import urllib.parse
 import pytest
 from django.utils.encoding import force_bytes
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
-from wcs.api_utils import get_secret_and_orig
+from wcs.api_utils import get_secret_and_orig, is_url_signed, sign_url
-from wcs.api_utils import is_url_signed
-from wcs.api_utils import sign_url
 from wcs.qommon.errors import AccessForbiddenError
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.ident.password_accounts import PasswordAccount

tests/api/test_all.py

@@ -7,9 +7,7 @@ import os
 import mock
 import pytest
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
 from wcs.api_utils import sign_url
 from wcs.formdef import FormDef

tests/api/test_carddef.py

@@ -11,12 +11,9 @@ import mock
 import pytest
 from django.utils.encoding import force_text
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
-from wcs import fields
+from wcs import fields, qommon
-from wcs import qommon
 from wcs.api_utils import sign_url
 from wcs.carddef import CardDef
 from wcs.categories import CardDefCategory
@@ -24,8 +21,7 @@ from wcs.data_sources import NamedDataSource
 from wcs.qommon.afterjobs import AfterJob
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.upload_storage import PicklableUpload
-from wcs.workflows import Workflow
+from wcs.workflows import Workflow, WorkflowBackofficeFieldsFormDef
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
 
 from .utils import sign_uri
 

tests/api/test_category.py

@@ -4,9 +4,7 @@ import os
 
 import pytest
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
 from wcs.categories import Category
 from wcs.formdef import FormDef

tests/api/test_custom_view.py

@@ -7,9 +7,7 @@ import zipfile
 
 import pytest
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
 from wcs import fields
 from wcs.carddef import CardDef

tests/api/test_formdata.py

@@ -12,10 +12,7 @@ import zipfile
 import pytest
 from django.utils.encoding import force_bytes
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs import fields
 from wcs.blocks import BlockDef
@@ -26,9 +23,7 @@ from wcs.qommon import ods
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.ident.password_accounts import PasswordAccount
 from wcs.qommon.upload_storage import PicklableUpload
-from wcs.workflows import EditableWorkflowStatusItem
+from wcs.workflows import EditableWorkflowStatusItem, Workflow, WorkflowBackofficeFieldsFormDef
-from wcs.workflows import Workflow
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
 
 from .utils import sign_uri
 

tests/api/test_formdef.py

@@ -12,20 +12,16 @@ import mock
 import pytest
 from django.utils.encoding import force_text
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
-from wcs import fields
+from wcs import fields, qommon
-from wcs import qommon
 from wcs.api_utils import sign_url
 from wcs.data_sources import NamedDataSource
 from wcs.formdef import FormDef
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.upload_storage import PicklableUpload
 from wcs.wf.jump import JumpWorkflowStatusItem
-from wcs.workflows import Workflow
+from wcs.workflows import Workflow, WorkflowBackofficeFieldsFormDef
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
 
 from .utils import sign_uri
 

tests/api/test_user.py

@@ -5,17 +5,14 @@ import os
 
 import pytest
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
 from wcs import fields
 from wcs.formdef import FormDef
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.ident.password_accounts import PasswordAccount
 from wcs.qommon.upload_storage import PicklableUpload
-from wcs.workflows import Workflow
+from wcs.workflows import Workflow, WorkflowVariablesFieldsFormDef
-from wcs.workflows import WorkflowVariablesFieldsFormDef
 
 from .utils import sign_uri
 

tests/api/test_utils.py

@@ -1,8 +1,6 @@
 import pytest
-from quixote import cleanup
+from quixote import cleanup, get_response
-from quixote import get_response
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import clean_temporary_pub
-from utilities import create_temporary_pub
 
 from wcs import sessions
 from wcs.api_utils import get_query_flag

tests/api/test_workflow.py

@@ -4,9 +4,7 @@ import os
 
 import pytest
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
 from wcs import fields
 from wcs.formdef import FormDef

tests/backoffice_pages/test_all.py

@@ -13,10 +13,7 @@ import mock
 import pytest
 from quixote import get_publisher
 from quixote.http_request import Upload as QuixoteUpload
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 import wcs.qommon.storage as st
 from wcs import fields
@@ -31,24 +28,24 @@ from wcs.qommon.upload_storage import PicklableUpload
 from wcs.roles import logged_users_role
 from wcs.wf.backoffice_fields import SetBackofficeFieldsWorkflowStatusItem
 from wcs.wf.create_carddata import CreateCarddataWorkflowStatusItem
-from wcs.wf.create_formdata import CreateFormdataWorkflowStatusItem
+from wcs.wf.create_formdata import CreateFormdataWorkflowStatusItem, Mapping
-from wcs.wf.create_formdata import Mapping
 from wcs.wf.export_to_model import ExportToModel
-from wcs.wf.form import FormWorkflowStatusItem
+from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-from wcs.wf.form import WorkflowFormFieldsFormDef
 from wcs.wf.jump import JumpWorkflowStatusItem
 from wcs.wf.redirect_to_url import RedirectToUrlWorkflowStatusItem
 from wcs.wf.register_comment import RegisterCommenterWorkflowStatusItem
 from wcs.wf.resubmit import ResubmitWorkflowStatusItem
 from wcs.wf.wscall import WebserviceCallStatusItem
-from wcs.workflows import ChoiceWorkflowStatusItem
+from wcs.workflows import (
-from wcs.workflows import CommentableWorkflowStatusItem
+    ChoiceWorkflowStatusItem,
-from wcs.workflows import DisplayMessageWorkflowStatusItem
+    CommentableWorkflowStatusItem,
-from wcs.workflows import EditableWorkflowStatusItem
+    DisplayMessageWorkflowStatusItem,
-from wcs.workflows import JumpOnSubmitWorkflowStatusItem
+    EditableWorkflowStatusItem,
-from wcs.workflows import Workflow
+    JumpOnSubmitWorkflowStatusItem,
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
+    Workflow,
-from wcs.workflows import WorkflowCriticalityLevel
+    WorkflowBackofficeFieldsFormDef,
+    WorkflowCriticalityLevel,
+)
 from wcs.wscalls import NamedWsCall
 
 
@@ -1757,8 +1754,7 @@ def test_backoffice_statistics_with_no_formdefs(pub):
     create_environment(pub)
     FormDef.wipe()
     if pub.is_using_postgresql():
-        from wcs.sql import drop_global_views
+        from wcs.sql import drop_global_views, get_connection_and_cursor
-        from wcs.sql import get_connection_and_cursor
 
         conn, cur = get_connection_and_cursor()
         drop_global_views(conn, cur)
@@ -3147,8 +3143,7 @@ def test_management_views_with_no_formdefs(pub):
     create_environment(pub)
     FormDef.wipe()
 
-    from wcs.sql import drop_global_views
+    from wcs.sql import drop_global_views, get_connection_and_cursor
-    from wcs.sql import get_connection_and_cursor
 
     conn, cur = get_connection_and_cursor()
     drop_global_views(conn, cur)

tests/backoffice_pages/test_carddata.py

@@ -4,10 +4,7 @@ import os
 import uuid
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 from webtest import Upload
 
 from wcs import fields
@@ -17,8 +14,7 @@ from wcs.categories import CardDefCategory
 from wcs.formdef import FormDef
 from wcs.qommon.http_request import HTTPRequest
 from wcs.wf.wscall import WebserviceCallStatusItem
-from wcs.workflows import ChoiceWorkflowStatusItem
+from wcs.workflows import ChoiceWorkflowStatusItem, Workflow
-from wcs.workflows import Workflow
 
 from .test_all import create_user
 

tests/backoffice_pages/test_custom_view.py

@@ -4,10 +4,7 @@ import re
 
 import pytest
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs import fields
 from wcs.carddef import CardDef
@@ -15,8 +12,7 @@ from wcs.formdef import FormDef
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.ident.password_accounts import PasswordAccount
 
-from .test_all import create_superuser
+from .test_all import create_superuser, create_user
-from .test_all import create_user
 
 
 def pytest_generate_tests(metafunc):

tests/backoffice_pages/test_export.py

@@ -9,10 +9,7 @@ import xml.etree.ElementTree as ET
 import zipfile
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs import fields
 from wcs.blocks import BlockDef

tests/backoffice_pages/test_submission.py

@@ -6,10 +6,7 @@ import time
 import urllib.parse
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs import fields
 from wcs.api_utils import sign_url
@@ -19,11 +16,9 @@ from wcs.wf.backoffice_fields import SetBackofficeFieldsWorkflowStatusItem
 from wcs.wf.dispatch import DispatchWorkflowStatusItem
 from wcs.wf.jump import JumpWorkflowStatusItem
 from wcs.wf.redirect_to_url import RedirectToUrlWorkflowStatusItem
-from wcs.workflows import Workflow
+from wcs.workflows import Workflow, WorkflowBackofficeFieldsFormDef
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
 
-from .test_all import create_superuser
+from .test_all import create_superuser, create_user
-from .test_all import create_user
 
 
 def pytest_generate_tests(metafunc):

tests/conftest.py

@@ -2,9 +2,7 @@ import configparser
 import os
 
 import pytest
-from utilities import EmailsMocking
+from utilities import EmailsMocking, HttpRequestsMocking, SMSMocking
-from utilities import HttpRequestsMocking
-from utilities import SMSMocking
 
 
 def site_options(request, pub, section, variable, value):

tests/form_pages/test_all.py

@@ -12,21 +12,15 @@ import zipfile
 
 import mock
 import pytest
-from webtest import Hidden
+from webtest import Hidden, Radio, Upload
-from webtest import Radio
-from webtest import Upload
 
 try:
     from PIL import Image
 except ImportError:
     Image = None
 
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_bytes, force_text
-from django.utils.encoding import force_text
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import clean_temporary_pub
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs import fields
 from wcs.blocks import BlockDef
@@ -42,22 +36,22 @@ from wcs.qommon.misc import ConnectionError
 from wcs.roles import logged_users_role
 from wcs.tracking_code import TrackingCode
 from wcs.wf.backoffice_fields import SetBackofficeFieldsWorkflowStatusItem
-from wcs.wf.create_formdata import CreateFormdataWorkflowStatusItem
+from wcs.wf.create_formdata import CreateFormdataWorkflowStatusItem, Mapping
-from wcs.wf.create_formdata import Mapping
+from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-from wcs.wf.form import FormWorkflowStatusItem
-from wcs.wf.form import WorkflowFormFieldsFormDef
 from wcs.wf.jump import JumpWorkflowStatusItem
 from wcs.wf.redirect_to_url import RedirectToUrlWorkflowStatusItem
 from wcs.wf.register_comment import RegisterCommenterWorkflowStatusItem
 from wcs.wf.resubmit import ResubmitWorkflowStatusItem
-from wcs.workflows import ChoiceWorkflowStatusItem
+from wcs.workflows import (
-from wcs.workflows import CommentableWorkflowStatusItem
+    ChoiceWorkflowStatusItem,
-from wcs.workflows import DisplayMessageWorkflowStatusItem
+    CommentableWorkflowStatusItem,
-from wcs.workflows import EditableWorkflowStatusItem
+    DisplayMessageWorkflowStatusItem,
-from wcs.workflows import JumpOnSubmitWorkflowStatusItem
+    EditableWorkflowStatusItem,
-from wcs.workflows import Workflow
+    JumpOnSubmitWorkflowStatusItem,
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
+    Workflow,
-from wcs.workflows import WorkflowVariablesFieldsFormDef
+    WorkflowBackofficeFieldsFormDef,
+    WorkflowVariablesFieldsFormDef,
+)
 
 
 def assert_equal_zip(stream1, stream2):

tests/form_pages/test_block.py

@@ -5,10 +5,7 @@ import json
 
 import mock
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 from webtest import Upload
 
 from wcs import fields
@@ -16,8 +13,7 @@ from wcs.blocks import BlockDef
 from wcs.categories import Category
 from wcs.data_sources import NamedDataSource
 from wcs.formdef import FormDef
-from wcs.wf.form import FormWorkflowStatusItem
+from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-from wcs.wf.form import WorkflowFormFieldsFormDef
 from wcs.workflows import Workflow
 
 from .test_all import create_user

tests/form_pages/test_formdata.py

@@ -13,32 +13,27 @@ import mock
 import pytest
 from django.utils.encoding import force_bytes
 from quixote.http_request import Upload as QuixoteUpload
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
+from webtest import Hidden, Upload
-from utilities import get_app
-from utilities import login
-from webtest import Hidden
-from webtest import Upload
 
 from wcs import fields
 from wcs.data_sources import NamedDataSource
 from wcs.formdef import FormDef
 from wcs.qommon.form import UploadedFile
 from wcs.wf.attachment import AddAttachmentWorkflowStatusItem
-from wcs.wf.export_to_model import ExportToModel
+from wcs.wf.export_to_model import ExportToModel, transform_to_pdf
-from wcs.wf.export_to_model import transform_to_pdf
+from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-from wcs.wf.form import FormWorkflowStatusItem
-from wcs.wf.form import WorkflowFormFieldsFormDef
 from wcs.wf.jump import JumpWorkflowStatusItem
 from wcs.wf.register_comment import RegisterCommenterWorkflowStatusItem
-from wcs.workflows import ChoiceWorkflowStatusItem
+from wcs.workflows import (
-from wcs.workflows import DisplayMessageWorkflowStatusItem
+    ChoiceWorkflowStatusItem,
-from wcs.workflows import Workflow
+    DisplayMessageWorkflowStatusItem,
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
+    Workflow,
+    WorkflowBackofficeFieldsFormDef,
+)
 from wcs.wscalls import NamedWsCall
 
-from .test_all import create_user
+from .test_all import create_user, create_user_and_admin
-from .test_all import create_user_and_admin
 
 
 def pytest_generate_tests(metafunc):

tests/test_auth_pages.py

@@ -1,8 +1,5 @@
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs.qommon.ident.password_accounts import PasswordAccount
 

tests/test_carddef.py

@@ -2,13 +2,11 @@ import io
 import xml.etree.ElementTree as ET
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import create_temporary_pub
 
 from wcs.carddef import CardDef
 from wcs.categories import CardDefCategory
-from wcs.fields import ItemField
+from wcs.fields import ItemField, StringField
-from wcs.fields import StringField
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.misc import indent_xml as indent
 from wcs.qommon.template import Template

tests/test_categories.py

@@ -7,8 +7,7 @@ import pytest
 from quixote import cleanup
 from utilities import create_temporary_pub
 
-from wcs.categories import CardDefCategory
+from wcs.categories import CardDefCategory, Category
-from wcs.categories import Category
 
 
 def setup_module(module):

tests/test_convert_to_sql.py

@@ -4,13 +4,10 @@ import random
 
 import psycopg2
 import pytest
-from django.core.management import call_command
+from django.core.management import call_command, get_commands
-from django.core.management import get_commands
 from django.core.management.base import CommandError
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, force_connections_close
-from utilities import create_temporary_pub
-from utilities import force_connections_close
 
 from wcs.fields import BoolField
 from wcs.formdef import FormDef

tests/test_ctl.py

@@ -6,10 +6,8 @@ from email.mime.text import MIMEText
 
 import psycopg2
 import pytest
-from django.core.management import CommandError
+from django.core.management import CommandError, call_command
-from django.core.management import call_command
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import clean_temporary_pub
-from utilities import create_temporary_pub
 
 import wcs.qommon.ctl
 from wcs.ctl.delete_tenant import CmdDeleteTenant
@@ -17,19 +15,16 @@ from wcs.ctl.management.commands.runscript import Command as CmdRunScript
 from wcs.ctl.management.commands.trigger_jumps import select_and_jump_formdata
 from wcs.ctl.rebuild_indexes import rebuild_vhost_indexes
 from wcs.ctl.wipe_data import CmdWipeData
-from wcs.fields import EmailField
+from wcs.fields import EmailField, StringField
-from wcs.fields import StringField
 from wcs.formdef import FormDef
 from wcs.qommon.afterjobs import AfterJob
 from wcs.qommon.management.commands.collectstatic import Command as CmdCollectStatic
 from wcs.qommon.management.commands.makemessages import Command as CmdMakeMessages
 from wcs.qommon.management.commands.migrate import Command as CmdMigrate
 from wcs.qommon.management.commands.migrate_schemas import Command as CmdMigrateSchemas
-from wcs.sql import cleanup_connection
+from wcs.sql import cleanup_connection, get_connection_and_cursor
-from wcs.sql import get_connection_and_cursor
 from wcs.wf.jump import JumpWorkflowStatusItem
-from wcs.workflows import Workflow
+from wcs.workflows import Workflow, WorkflowStatusItem
-from wcs.workflows import WorkflowStatusItem
 
 
 @pytest.fixture

tests/test_datasource.py

@@ -10,17 +10,12 @@ import urllib.parse
 import mock
 import pytest
 from quixote import cleanup
-from test_widgets import MockHtmlForm
+from test_widgets import MockHtmlForm, mock_form_submission
-from test_widgets import mock_form_submission
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import clean_temporary_pub
-from utilities import create_temporary_pub
 
-from wcs import data_sources
+from wcs import data_sources, fields
-from wcs import fields
+from wcs.data_sources import NamedDataSource, register_data_source_function
-from wcs.data_sources import NamedDataSource
+from wcs.qommon.form import Form, get_request
-from wcs.data_sources import register_data_source_function
-from wcs.qommon.form import Form
-from wcs.qommon.form import get_request
 from wcs.qommon.http_request import HTTPRequest
 
 

tests/test_datasource_chrono.py

@@ -10,9 +10,7 @@ from quixote import cleanup
 from utilities import create_temporary_pub
 
 from wcs import fields
-from wcs.data_sources import NamedDataSource
+from wcs.data_sources import NamedDataSource, build_agenda_datasources, collect_agenda_data
-from wcs.data_sources import build_agenda_datasources
-from wcs.data_sources import collect_agenda_data
 from wcs.formdef import FormDef
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.misc import ConnectionError

tests/test_ezt.py

@@ -4,16 +4,16 @@ import os
 
 import pytest
 from quixote import cleanup
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
-from wcs.qommon.ezt import ArgCountSyntaxError
+from wcs.qommon.ezt import (
-from wcs.qommon.ezt import Template
+    ArgCountSyntaxError,
-from wcs.qommon.ezt import UnclosedBlocksError
+    Template,
-from wcs.qommon.ezt import UnmatchedElseError
+    UnclosedBlocksError,
-from wcs.qommon.ezt import UnmatchedEndError
+    UnmatchedElseError,
-from wcs.qommon.ezt import _re_parse
+    UnmatchedEndError,
+    _re_parse,
+)
 from wcs.scripts import ScriptsSubstitutionProxy
 
 

tests/test_fc_auth.py

@@ -3,12 +3,9 @@ import json
 import urllib.parse
 
 import mock
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_bytes, force_text
-from django.utils.encoding import force_text
+from quixote import cleanup, get_session_manager
-from quixote import cleanup
+from utilities import create_temporary_pub, get_app
-from quixote import get_session_manager
-from utilities import create_temporary_pub
-from utilities import get_app
 
 PROFILE = {
     'fields': [

tests/test_fields.py

@@ -7,8 +7,7 @@ import pytest
 from bs4 import BeautifulSoup
 from quixote import cleanup
 from quixote.http_request import Upload
-from utilities import MockSubstitutionVariables
+from utilities import MockSubstitutionVariables, create_temporary_pub
-from utilities import create_temporary_pub
 
 from wcs import fields
 from wcs.formdef import FormDef

tests/test_formdata.py

@@ -8,12 +8,9 @@ import mock
 import pytest
 from quixote import get_publisher
 from quixote.http_request import Upload
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import create_temporary_pub
 
-from wcs import fields
+from wcs import fields, formdef, sessions
-from wcs import formdef
-from wcs import sessions
 from wcs.blocks import BlockDef
 from wcs.carddef import CardDef
 from wcs.categories import Category
@@ -27,10 +24,12 @@ from wcs.qommon.upload_storage import PicklableUpload
 from wcs.variables import LazyFormData
 from wcs.wf.register_comment import JournalEvolutionPart
 from wcs.wf.wscall import JournalWsCallErrorPart
-from wcs.workflows import Workflow
+from wcs.workflows import (
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
+    Workflow,
-from wcs.workflows import WorkflowCriticalityLevel
+    WorkflowBackofficeFieldsFormDef,
-from wcs.workflows import WorkflowStatusItem
+    WorkflowCriticalityLevel,
+    WorkflowStatusItem,
+)
 
 
 def pytest_generate_tests(metafunc):

tests/test_formdef.py

@@ -11,25 +11,16 @@ import time
 import pytest
 from django.utils.encoding import force_bytes
 from quixote import cleanup
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import create_temporary_pub
 
 from wcs import fields
 from wcs.blocks import BlockDef
-from wcs.fields import DateField
+from wcs.fields import DateField, FileField, ItemField, PageField, StringField
-from wcs.fields import FileField
+from wcs.formdef import FormDef, get_formdefs_of_all_kinds
-from wcs.fields import ItemField
-from wcs.fields import PageField
-from wcs.fields import StringField
-from wcs.formdef import FormDef
-from wcs.formdef import get_formdefs_of_all_kinds
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.upload_storage import PicklableUpload
-from wcs.wf.form import FormWorkflowStatusItem
+from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-from wcs.wf.form import WorkflowFormFieldsFormDef
+from wcs.workflows import AttachmentEvolutionPart, Workflow, WorkflowBackofficeFieldsFormDef
-from wcs.workflows import AttachmentEvolutionPart
-from wcs.workflows import Workflow
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
 
 
 def pytest_generate_tests(metafunc):
@@ -504,10 +495,8 @@ def test_unused_file_removal_job(pub):
 def test_get_formdefs_of_all_kinds(pub):
     from wcs.admin.settings import UserFieldsFormDef
     from wcs.carddef import CardDef
-    from wcs.wf.form import FormWorkflowStatusItem
+    from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-    from wcs.wf.form import WorkflowFormFieldsFormDef
+    from wcs.workflows import WorkflowBackofficeFieldsFormDef, WorkflowVariablesFieldsFormDef
-    from wcs.workflows import WorkflowBackofficeFieldsFormDef
-    from wcs.workflows import WorkflowVariablesFieldsFormDef
 
     BlockDef.wipe()
     FormDef.wipe()

tests/test_formdef_import.py

@@ -11,9 +11,7 @@ from utilities import create_temporary_pub
 
 from wcs.carddef import CardDef
 from wcs.categories import Category
-from wcs.formdef import FormDef
+from wcs.formdef import FormDef, FormdefImportError, fields
-from wcs.formdef import FormdefImportError
-from wcs.formdef import fields
 from wcs.qommon.misc import indent_xml as indent
 from wcs.workflows import Workflow
 

tests/test_hobo.py

@@ -12,11 +12,9 @@ import urllib.parse
 import mock
 import pytest
 from quixote import cleanup
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import create_temporary_pub
 
-from wcs import fields
+from wcs import fields, sql
-from wcs import sql
 from wcs.ctl.check_hobos import CmdCheckHobos
 from wcs.publisher import WcsPublisher
 from wcs.qommon import force_str

tests/test_mail_templates.py

@@ -8,10 +8,7 @@ import xml.etree.ElementTree as ET
 import pytest
 from django.utils.encoding import force_bytes
 from quixote import cleanup
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 from webtest import Upload
 
 from wcs.fields import FileField
@@ -20,8 +17,7 @@ from wcs.mail_templates import MailTemplate
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.ident.password_accounts import PasswordAccount
 from wcs.qommon.upload_storage import PicklableUpload
-from wcs.workflows import SendmailWorkflowStatusItem
+from wcs.workflows import SendmailWorkflowStatusItem, Workflow
-from wcs.workflows import Workflow
 
 
 def setup_module(module):

tests/test_misc.py

@@ -15,31 +15,29 @@ import pytest
 from django.core.cache import cache
 from django.utils import translation
 from quixote import cleanup
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
 import wcs.api  # workaround against circular dependencies :/
 import wcs.qommon.storage
 from wcs.admin.settings import FileTypesDirectory
 from wcs.fields import StringField
-from wcs.qommon import evalutils
+from wcs.qommon import evalutils, force_str
-from wcs.qommon import force_str
 from wcs.qommon.backoffice.listing import pagination_links
 from wcs.qommon.emails import docutils
 from wcs.qommon.emails import email as send_email
 from wcs.qommon.form import FileSizeWidget
 from wcs.qommon.http_request import HTTPRequest
-from wcs.qommon.humantime import humanduration2seconds
+from wcs.qommon.humantime import humanduration2seconds, seconds2humanduration
-from wcs.qommon.humantime import seconds2humanduration
+from wcs.qommon.misc import (
-from wcs.qommon.misc import date_format
+    date_format,
-from wcs.qommon.misc import ellipsize
+    ellipsize,
-from wcs.qommon.misc import format_time
+    format_time,
-from wcs.qommon.misc import get_as_datetime
+    get_as_datetime,
-from wcs.qommon.misc import json_loads
+    json_loads,
-from wcs.qommon.misc import normalize_geolocation
+    normalize_geolocation,
-from wcs.qommon.misc import parse_isotime
+    parse_isotime,
-from wcs.qommon.misc import simplify
+    simplify,
+)
 from wcs.qommon.upload_storage import PicklableUpload
 from wcs.scripts import Script
 from wcs.wf.jump import JumpWorkflowStatusItem

tests/test_prefill.py

@@ -2,8 +2,7 @@ import datetime
 import shutil
 
 import pytest
-from quixote import cleanup
+from quixote import cleanup, get_request
-from quixote import get_request
 from utilities import create_temporary_pub
 
 from wcs import fields

tests/test_register.py

@@ -6,9 +6,7 @@ import shutil
 
 import pytest
 from quixote import cleanup
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
 from wcs.qommon import force_str
 from wcs.qommon.http_request import HTTPRequest

tests/test_role.py

@@ -3,8 +3,7 @@
 import pickle
 
 from quixote import get_publisher
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import create_temporary_pub
 
 from wcs.roles import get_user_roles
 

tests/test_rootdirectory.py

@@ -4,8 +4,7 @@ import sys
 
 import pytest
 from quixote import cleanup
-from utilities import create_temporary_pub
+from utilities import create_temporary_pub, get_app
-from utilities import get_app
 
 import wcs.forms.root
 from wcs import formdef

tests/test_saml_auth.py

@@ -10,20 +10,14 @@ except ImportError:
     lasso = None
 
 import pytest
-from quixote import cleanup
+from quixote import cleanup, get_session, get_session_manager
-from quixote import get_session
-from quixote import get_session_manager
 from quixote.errors import RequestError
 from test_hobo_notify import PROFILE
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
-from wcs.qommon import sessions
+from wcs.qommon import sessions, x509utils
-from wcs.qommon import x509utils
 from wcs.qommon.http_request import HTTPRequest
-from wcs.qommon.ident.idp import AdminIDPDir
+from wcs.qommon.ident.idp import AdminIDPDir, MethodAdminDirectory
-from wcs.qommon.ident.idp import MethodAdminDirectory
 from wcs.qommon.misc import get_lasso_server
 from wcs.qommon.saml2 import Saml2Directory
 

tests/test_sessions.py

@@ -5,10 +5,7 @@ import time
 
 import pytest
 from quixote import cleanup
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs import fields
 from wcs.formdef import FormDef

tests/test_snapshots.py

@@ -4,13 +4,9 @@ import shutil
 import xml.etree.ElementTree as ET
 
 import pytest
-from admin_pages.test_all import create_role
+from admin_pages.test_all import create_role, create_superuser
-from admin_pages.test_all import create_superuser
 from quixote.http_request import Upload
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 
 from wcs.blocks import BlockDef
 from wcs.carddef import CardDef
@@ -20,8 +16,7 @@ from wcs.formdef import FormDef
 from wcs.qommon.form import UploadedFile
 from wcs.qommon.misc import localstrftime
 from wcs.wf.export_to_model import ExportToModel
-from wcs.wf.form import FormWorkflowStatusItem
+from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-from wcs.wf.form import WorkflowFormFieldsFormDef
 from wcs.workflows import Workflow
 from wcs.wscalls import NamedWsCall
 

tests/test_sql.py

@@ -13,21 +13,16 @@ import time
 import pytest
 from django.core.management import call_command
 from quixote import cleanup
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import create_temporary_pub
 
 import wcs.qommon.storage as st
-from wcs import fields
+from wcs import fields, publisher, sql
-from wcs import publisher
-from wcs import sql
 from wcs.formdata import Evolution
 from wcs.formdef import FormDef
 from wcs.qommon import force_str
 from wcs.wf.jump import JumpWorkflowStatusItem
 from wcs.wf.register_comment import RegisterCommenterWorkflowStatusItem
-from wcs.workflows import CommentableWorkflowStatusItem
+from wcs.workflows import CommentableWorkflowStatusItem, Workflow, WorkflowCriticalityLevel
-from wcs.workflows import Workflow
-from wcs.workflows import WorkflowCriticalityLevel
 
 postgresql = pytest.mark.postgresql
 

tests/test_storage.py

@@ -11,8 +11,7 @@ from utilities import create_temporary_pub
 import wcs.qommon.storage as st
 from wcs.carddef import CardDef
 from wcs.formdef import FormDef
-from wcs.qommon.storage import StorableObject
+from wcs.qommon.storage import StorableObject, cache_umask
-from wcs.qommon.storage import cache_umask
 
 
 def setup_module(module):

tests/test_templates.py

@@ -13,15 +13,13 @@ except ImportError:
 
 from django.test import override_settings
 from django.utils.timezone import now
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import create_temporary_pub
 
 from wcs import fields
 from wcs.formdef import FormDef
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.substitution import CompatibilityNamesDict
-from wcs.qommon.template import Template
+from wcs.qommon.template import Template, TemplateError
-from wcs.qommon.template import TemplateError
 from wcs.variables import LazyFormData
 
 

tests/test_texts.py

@@ -2,8 +2,7 @@ import shutil
 import sys
 
 from quixote import cleanup
-from utilities import MockSubstitutionVariables
+from utilities import MockSubstitutionVariables, create_temporary_pub
-from utilities import create_temporary_pub
 
 from wcs.qommon.admin.texts import TextsDirectory
 from wcs.qommon.http_request import HTTPRequest

tests/test_tracking_code.py

@@ -1,6 +1,5 @@
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import create_temporary_pub
 
 from wcs.formdef import FormDef
 

tests/test_upload_storage.py

@@ -5,10 +5,7 @@ import os
 
 import mock
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app, login
-from utilities import create_temporary_pub
-from utilities import get_app
-from utilities import login
 from webtest import Upload
 
 from wcs import fields

tests/test_users.py

@@ -9,8 +9,7 @@ import pytest
 from quixote import cleanup
 from utilities import create_temporary_pub
 
-from wcs import fields
+from wcs import fields, publisher
-from wcs import publisher
 from wcs.variables import LazyUser
 
 

tests/test_variadic_url.py

@@ -1,6 +1,5 @@
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import create_temporary_pub
 
 from wcs.qommon.ezt import EZTException
 from wcs.qommon.misc import get_variadic_url

tests/test_widgets.py

@@ -6,8 +6,7 @@ import shutil
 
 import mechanize
 import pytest
-from quixote import cleanup
+from quixote import cleanup, get_response
-from quixote import get_response
 from quixote.http_request import parse_query
 from utilities import create_temporary_pub
 

tests/test_workflow_import.py

@@ -5,41 +5,39 @@ import xml.etree.ElementTree as ET
 
 import pytest
 from quixote.http_request import Upload
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub
-from utilities import create_temporary_pub
 
 from wcs.carddef import CardDef
-from wcs.fields import FileField
+from wcs.fields import FileField, StringField
-from wcs.fields import StringField
 from wcs.formdef import FormDef
 from wcs.mail_templates import MailTemplate
 from wcs.qommon.form import UploadedFile
 from wcs.qommon.misc import indent_xml as indent
 from wcs.wf.attachment import AddAttachmentWorkflowStatusItem
 from wcs.wf.backoffice_fields import SetBackofficeFieldsWorkflowStatusItem
-from wcs.wf.create_formdata import CreateFormdataWorkflowStatusItem
+from wcs.wf.create_formdata import CreateFormdataWorkflowStatusItem, Mapping
-from wcs.wf.create_formdata import Mapping
 from wcs.wf.dispatch import DispatchWorkflowStatusItem
 from wcs.wf.export_to_model import ExportToModel
 from wcs.wf.external_workflow import ExternalWorkflowGlobalAction
-from wcs.wf.form import FormWorkflowStatusItem
+from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-from wcs.wf.form import WorkflowFormFieldsFormDef
 from wcs.wf.jump import JumpWorkflowStatusItem
 from wcs.wf.profile import UpdateUserProfileStatusItem
 from wcs.wf.redirect_to_url import RedirectToUrlWorkflowStatusItem
 from wcs.wf.register_comment import RegisterCommenterWorkflowStatusItem
 from wcs.wf.wscall import WebserviceCallStatusItem
-from wcs.workflows import ChoiceWorkflowStatusItem
+from wcs.workflows import (
-from wcs.workflows import CommentableWorkflowStatusItem
+    ChoiceWorkflowStatusItem,
-from wcs.workflows import DisplayMessageWorkflowStatusItem
+    CommentableWorkflowStatusItem,
-from wcs.workflows import JumpOnSubmitWorkflowStatusItem
+    DisplayMessageWorkflowStatusItem,
-from wcs.workflows import SendmailWorkflowStatusItem
+    JumpOnSubmitWorkflowStatusItem,
-from wcs.workflows import SendSMSWorkflowStatusItem
+    SendmailWorkflowStatusItem,
-from wcs.workflows import Workflow
+    SendSMSWorkflowStatusItem,
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
+    Workflow,
-from wcs.workflows import WorkflowCriticalityLevel
+    WorkflowBackofficeFieldsFormDef,
-from wcs.workflows import WorkflowImportError
+    WorkflowCriticalityLevel,
-from wcs.workflows import WorkflowVariablesFieldsFormDef
+    WorkflowImportError,
+    WorkflowVariablesFieldsFormDef,
+)
 
 
 @pytest.fixture

tests/test_workflows.py

@@ -16,84 +16,77 @@ try:
 except ImportError:
     Image = None
 
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_bytes, force_text
-from django.utils.encoding import force_text
+from quixote import cleanup, get_response
-from quixote import cleanup
-from quixote import get_response
 from quixote.http_request import Upload as QuixoteUpload
-from utilities import MockSubstitutionVariables
+from utilities import MockSubstitutionVariables, clean_temporary_pub, create_temporary_pub
-from utilities import clean_temporary_pub
-from utilities import create_temporary_pub
 
 from wcs import sessions
 from wcs.blocks import BlockDef
 from wcs.carddef import CardDef
-from wcs.fields import BlockField
+from wcs.fields import (
-from wcs.fields import BoolField
+    BlockField,
-from wcs.fields import CommentField
+    BoolField,
-from wcs.fields import DateField
+    CommentField,
-from wcs.fields import EmailField
+    DateField,
-from wcs.fields import FileField
+    EmailField,
-from wcs.fields import ItemField
+    FileField,
-from wcs.fields import ItemsField
+    ItemField,
-from wcs.fields import MapField
+    ItemsField,
-from wcs.fields import PageField
+    MapField,
-from wcs.fields import StringField
+    PageField,
-from wcs.fields import SubtitleField
+    StringField,
-from wcs.fields import TableField
+    SubtitleField,
-from wcs.fields import TextField
+    TableField,
-from wcs.fields import TitleField
+    TextField,
+    TitleField,
+)
 from wcs.formdata import Evolution
 from wcs.formdef import FormDef
 from wcs.qommon.errors import ConnectionError
 from wcs.qommon.form import *
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.upload_storage import PicklableUpload
-from wcs.wf.aggregation_email import AggregationEmail
+from wcs.wf.aggregation_email import (
-from wcs.wf.aggregation_email import AggregationEmailWorkflowStatusItem
+    AggregationEmail,
-from wcs.wf.aggregation_email import send_aggregation_emails
+    AggregationEmailWorkflowStatusItem,
+    send_aggregation_emails,
+)
 from wcs.wf.anonymise import AnonymiseWorkflowStatusItem
 from wcs.wf.backoffice_fields import SetBackofficeFieldsWorkflowStatusItem
 from wcs.wf.create_carddata import CreateCarddataWorkflowStatusItem
-from wcs.wf.create_formdata import CreateFormdataWorkflowStatusItem
+from wcs.wf.create_formdata import CreateFormdataWorkflowStatusItem, Mapping
-from wcs.wf.create_formdata import Mapping
+from wcs.wf.criticality import MODE_DEC, MODE_INC, MODE_SET, ModifyCriticalityWorkflowStatusItem
-from wcs.wf.criticality import MODE_DEC
-from wcs.wf.criticality import MODE_INC
-from wcs.wf.criticality import MODE_SET
-from wcs.wf.criticality import ModifyCriticalityWorkflowStatusItem
 from wcs.wf.dispatch import DispatchWorkflowStatusItem
 from wcs.wf.edit_carddata import EditCarddataWorkflowStatusItem
-from wcs.wf.export_to_model import ExportToModel
+from wcs.wf.export_to_model import ExportToModel, transform_to_pdf
-from wcs.wf.export_to_model import transform_to_pdf
 from wcs.wf.external_workflow import ExternalWorkflowGlobalAction
-from wcs.wf.form import FormWorkflowStatusItem
+from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
-from wcs.wf.form import WorkflowFormFieldsFormDef
 from wcs.wf.geolocate import GeolocateWorkflowStatusItem
-from wcs.wf.jump import JumpWorkflowStatusItem
+from wcs.wf.jump import JumpWorkflowStatusItem, _apply_timeouts
-from wcs.wf.jump import _apply_timeouts
 from wcs.wf.notification import SendNotificationWorkflowStatusItem
 from wcs.wf.profile import UpdateUserProfileStatusItem
 from wcs.wf.redirect_to_url import RedirectToUrlWorkflowStatusItem
-from wcs.wf.register_comment import JournalEvolutionPart
+from wcs.wf.register_comment import JournalEvolutionPart, RegisterCommenterWorkflowStatusItem
-from wcs.wf.register_comment import RegisterCommenterWorkflowStatusItem
 from wcs.wf.remove import RemoveWorkflowStatusItem
-from wcs.wf.roles import AddRoleWorkflowStatusItem
+from wcs.wf.roles import AddRoleWorkflowStatusItem, RemoveRoleWorkflowStatusItem
-from wcs.wf.roles import RemoveRoleWorkflowStatusItem
 from wcs.wf.timeout_jump import TimeoutWorkflowStatusItem
 from wcs.wf.wscall import WebserviceCallStatusItem
-from wcs.workflows import AbortActionException
+from wcs.workflows import (
-from wcs.workflows import AttachmentEvolutionPart
+    AbortActionException,
-from wcs.workflows import ChoiceWorkflowStatusItem
+    AttachmentEvolutionPart,
-from wcs.workflows import CommentableWorkflowStatusItem
+    ChoiceWorkflowStatusItem,
-from wcs.workflows import DisplayMessageWorkflowStatusItem
+    CommentableWorkflowStatusItem,
-from wcs.workflows import SendmailWorkflowStatusItem
+    DisplayMessageWorkflowStatusItem,
-from wcs.workflows import SendSMSWorkflowStatusItem
+    SendmailWorkflowStatusItem,
-from wcs.workflows import Workflow
+    SendSMSWorkflowStatusItem,
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
+    Workflow,
-from wcs.workflows import WorkflowCriticalityLevel
+    WorkflowBackofficeFieldsFormDef,
-from wcs.workflows import WorkflowStatusItem
+    WorkflowCriticalityLevel,
-from wcs.workflows import WorkflowVariablesFieldsFormDef
+    WorkflowStatusItem,
-from wcs.workflows import perform_items
+    WorkflowVariablesFieldsFormDef,
+    perform_items,
+)
 
 
 def setup_module(module):

tests/test_wscall.py

@@ -1,9 +1,7 @@
 import json
 
 import pytest
-from utilities import clean_temporary_pub
+from utilities import clean_temporary_pub, create_temporary_pub, get_app
-from utilities import create_temporary_pub
-from utilities import get_app
 
 from wcs import fields
 from wcs.formdef import FormDef

tests/utilities.py

@@ -10,10 +10,8 @@ import urllib.parse
 
 import psycopg2
 from django.conf import settings
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_bytes, force_text
-from django.utils.encoding import force_text
+from quixote import cleanup, get_publisher
-from quixote import cleanup
-from quixote import get_publisher
 from webtest import TestApp
 
 import wcs
@@ -21,10 +19,7 @@ import wcs.middleware
 import wcs.qommon.emails
 import wcs.qommon.sms
 import wcs.wsgi
-from wcs import compat
+from wcs import compat, custom_views, sessions, sql
-from wcs import custom_views
-from wcs import sessions
-from wcs import sql
 from wcs.qommon import force_str
 from wcs.qommon.errors import ConnectionError
 from wcs.roles import Role

wcs/admin/api_access.py

@@ -16,21 +16,14 @@
 
 import uuid
 
-from quixote import get_response
+from quixote import get_response, redirect
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.api_access import ApiAccess
-from wcs.qommon import _
+from wcs.qommon import _, errors, template
-from wcs.qommon import errors
-from wcs.qommon import template
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import Form
+from wcs.qommon.form import Form, HtmlWidget, StringWidget, TextWidget
-from wcs.qommon.form import HtmlWidget
-from wcs.qommon.form import StringWidget
-from wcs.qommon.form import TextWidget
 
 
 class ApiAccessUI:

wcs/admin/blocks.py

@@ -16,29 +16,17 @@
 
 import xml.etree.ElementTree as ET
 
-from quixote import get_publisher
+from quixote import get_publisher, get_response, get_session, redirect
-from quixote import get_response
-from quixote import get_session
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.admin import utils
-from wcs.admin.fields import FieldDefPage
+from wcs.admin.fields import FieldDefPage, FieldsDirectory
-from wcs.admin.fields import FieldsDirectory
 from wcs.backoffice.snapshots import SnapshotsDirectory
-from wcs.blocks import BlockDef
+from wcs.blocks import BlockDef, BlockdefImportError
-from wcs.blocks import BlockdefImportError
+from wcs.qommon import N_, _, misc, template
-from wcs.qommon import N_
-from wcs.qommon import _
-from wcs.qommon import misc
-from wcs.qommon import template
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import FileWidget
+from wcs.qommon.form import FileWidget, Form, HtmlWidget, StringWidget
-from wcs.qommon.form import Form
-from wcs.qommon.form import HtmlWidget
-from wcs.qommon.form import StringWidget
 
 
 class BlockFieldDefPage(FieldDefPage):

wcs/admin/categories.py

@@ -14,24 +14,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from quixote import get_request
+from quixote import get_request, get_response, redirect
-from quixote import get_response
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.carddef import CardDef
-from wcs.categories import CardDefCategory
+from wcs.categories import CardDefCategory, Category
-from wcs.categories import Category
 from wcs.formdef import FormDef
-from wcs.qommon import N_
+from wcs.qommon import N_, _
-from wcs.qommon import _
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import Form
+from wcs.qommon.form import Form, HtmlWidget, StringWidget, WysiwygTextWidget
-from wcs.qommon.form import HtmlWidget
-from wcs.qommon.form import StringWidget
-from wcs.qommon.form import WysiwygTextWidget
 
 
 class CategoryUI:

wcs/admin/data_sources.py

@@ -16,36 +16,34 @@
 
 import xml.etree.ElementTree as ET
 
-from quixote import get_publisher
+from quixote import get_publisher, redirect
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.admin import utils
 from wcs.backoffice.snapshots import SnapshotsDirectory
 from wcs.carddef import CardDef
-from wcs.data_sources import DataSourceSelectionWidget
+from wcs.data_sources import (
-from wcs.data_sources import NamedDataSource
+    DataSourceSelectionWidget,
-from wcs.data_sources import RefreshAgendas
+    NamedDataSource,
-from wcs.data_sources import get_structured_items
+    RefreshAgendas,
-from wcs.data_sources import has_chrono
+    get_structured_items,
+    has_chrono,
+)
 from wcs.formdef import get_formdefs_of_all_kinds
-from wcs.qommon import _
+from wcs.qommon import _, errors, force_str, misc, template
-from wcs.qommon import errors
-from wcs.qommon import force_str
-from wcs.qommon import misc
-from wcs.qommon import template
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import CheckboxWidget
+from wcs.qommon.form import (
-from wcs.qommon.form import DurationWidget
+    CheckboxWidget,
-from wcs.qommon.form import FileWidget
+    DurationWidget,
-from wcs.qommon.form import Form
+    FileWidget,
-from wcs.qommon.form import HtmlWidget
+    Form,
-from wcs.qommon.form import StringWidget
+    HtmlWidget,
-from wcs.qommon.form import TextWidget
+    StringWidget,
-from wcs.qommon.form import get_response
+    TextWidget,
-from wcs.qommon.form import get_session
+    get_response,
+    get_session,
+)
 
 
 class NamedDataSourceUI:

wcs/admin/fields.py

@@ -19,31 +19,18 @@
 import copy
 import json
 
-from quixote import get_request
+from quixote import get_request, get_response, get_session, redirect
-from quixote import get_response
-from quixote import get_session
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmlescape, htmltext
-from quixote.html import htmlescape
-from quixote.html import htmltext
 
 from wcs import fields
 from wcs.admin import utils
 from wcs.fields import get_field_options
 from wcs.formdef import FormDef
-from wcs.qommon import N_
+from wcs.qommon import N_, _, errors, get_cfg, misc
-from wcs.qommon import _
-from wcs.qommon import errors
-from wcs.qommon import get_cfg
-from wcs.qommon import misc
 from wcs.qommon.admin.menu import command_icon
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import CheckboxWidget
+from wcs.qommon.form import CheckboxWidget, Form, HtmlWidget, SingleSelectWidget, StringWidget
-from wcs.qommon.form import Form
-from wcs.qommon.form import HtmlWidget
-from wcs.qommon.form import SingleSelectWidget
-from wcs.qommon.form import StringWidget
 
 
 class FieldDefPage(Directory):

wcs/admin/forms.py

@@ -23,61 +23,45 @@ import tarfile
 import time
 import xml.etree.ElementTree as ET
 
-from quixote import get_publisher
+from quixote import get_publisher, get_request, get_response, get_session, redirect
-from quixote import get_request
+from quixote.directory import AccessControlled, Directory
-from quixote import get_response
+from quixote.html import TemplateIO, htmltext
-from quixote import get_session
-from quixote import redirect
-from quixote.directory import AccessControlled
-from quixote.directory import Directory
-from quixote.html import TemplateIO
-from quixote.html import htmltext
 
 from wcs.backoffice.snapshots import SnapshotsDirectory
 from wcs.carddef import CardDef
 from wcs.categories import Category
-from wcs.formdef import DRAFTS_DEFAULT_LIFESPAN
+from wcs.formdef import DRAFTS_DEFAULT_LIFESPAN, FormDef, FormdefImportError, FormdefImportRecoverableError
-from wcs.formdef import FormDef
-from wcs.formdef import FormdefImportError
-from wcs.formdef import FormdefImportRecoverableError
 from wcs.forms.root import qrcode
-from wcs.qommon import N_
+from wcs.qommon import N_, _, force_str, get_logger, misc, template
-from wcs.qommon import _
-from wcs.qommon import force_str
-from wcs.qommon import get_logger
-from wcs.qommon import misc
-from wcs.qommon import template
 from wcs.qommon.afterjobs import AfterJob
 from wcs.qommon.backoffice.menu import html_top
 from wcs.qommon.errors import TraversalError
-from wcs.qommon.form import CheckboxesWidget
+from wcs.qommon.form import (
-from wcs.qommon.form import CheckboxWidget
+    CheckboxesWidget,
-from wcs.qommon.form import DateTimeWidget
+    CheckboxWidget,
-from wcs.qommon.form import DateWidget
+    DateTimeWidget,
-from wcs.qommon.form import FileWidget
+    DateWidget,
-from wcs.qommon.form import Form
+    FileWidget,
-from wcs.qommon.form import HtmlWidget
+    Form,
-from wcs.qommon.form import SingleSelectWidget
+    HtmlWidget,
-from wcs.qommon.form import StringWidget
+    SingleSelectWidget,
-from wcs.qommon.form import UrlWidget
+    StringWidget,
-from wcs.qommon.form import ValidatedStringWidget
+    UrlWidget,
-from wcs.qommon.form import WcsExtraStringWidget
+    ValidatedStringWidget,
-from wcs.qommon.form import WidgetList
+    WcsExtraStringWidget,
-from wcs.qommon.form import WysiwygTextWidget
+    WidgetList,
+    WysiwygTextWidget,
+)
 from wcs.qommon.misc import C_
-from wcs.qommon.storage import Equal
+from wcs.qommon.storage import Equal, NotEqual, Null
-from wcs.qommon.storage import NotEqual
+from wcs.roles import get_user_roles, logged_users_role
-from wcs.qommon.storage import Null
-from wcs.roles import get_user_roles
-from wcs.roles import logged_users_role
 from wcs.workflows import Workflow
 
 from . import utils
 from .blocks import BlocksDirectory
 from .categories import CategoriesDirectory
 from .data_sources import NamedDataSourcesDirectory
-from .fields import FieldDefPage
+from .fields import FieldDefPage, FieldsDirectory
-from .fields import FieldsDirectory
 from .logged_errors import LoggedErrorsDirectory
 
 

wcs/admin/logged_errors.py

@@ -17,26 +17,13 @@
 import re
 
 from django.utils.text import Truncator
-from quixote import get_publisher
+from quixote import get_publisher, get_request, get_response, redirect
-from quixote import get_request
-from quixote import get_response
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
-from wcs.qommon import N_
+from wcs.qommon import N_, _, errors, misc, ngettext, template
-from wcs.qommon import _
-from wcs.qommon import errors
-from wcs.qommon import misc
-from wcs.qommon import ngettext
-from wcs.qommon import template
 from wcs.qommon.backoffice.listing import pagination_links
-from wcs.qommon.storage import Equal
+from wcs.qommon.storage import Equal, NotEqual, NotNull, Null, Or
-from wcs.qommon.storage import NotEqual
-from wcs.qommon.storage import NotNull
-from wcs.qommon.storage import Null
-from wcs.qommon.storage import Or
 
 
 class LoggedErrorDirectory(Directory):

wcs/admin/mail_templates.py

@@ -16,28 +16,23 @@
 
 import xml.etree.ElementTree as ET
 
-from quixote import get_publisher
+from quixote import get_publisher, get_response, redirect
-from quixote import get_response
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.mail_templates import MailTemplate
-from wcs.qommon import _
+from wcs.qommon import _, errors, force_str, misc, template
-from wcs.qommon import errors
-from wcs.qommon import force_str
-from wcs.qommon import misc
-from wcs.qommon import template
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import ComputedExpressionWidget
+from wcs.qommon.form import (
-from wcs.qommon.form import FileWidget
+    ComputedExpressionWidget,
-from wcs.qommon.form import Form
+    FileWidget,
-from wcs.qommon.form import HtmlWidget
+    Form,
-from wcs.qommon.form import StringWidget
+    HtmlWidget,
-from wcs.qommon.form import TextWidget
+    StringWidget,
-from wcs.qommon.form import WidgetList
+    TextWidget,
-from wcs.qommon.form import get_session
+    WidgetList,
+    get_session,
+)
 
 
 class MailTemplatesDirectory(Directory):

wcs/admin/roles.py

@@ -14,24 +14,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from quixote import get_publisher
+from quixote import get_publisher, get_response, redirect
-from quixote import get_response
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.formdef import FormDef
-from wcs.qommon import _
+from wcs.qommon import _, errors, get_cfg
-from wcs.qommon import errors
-from wcs.qommon import get_cfg
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import CheckboxWidget
+from wcs.qommon.form import CheckboxWidget, Form, HtmlWidget, StringWidget, TextWidget, WidgetList
-from wcs.qommon.form import Form
-from wcs.qommon.form import HtmlWidget
-from wcs.qommon.form import StringWidget
-from wcs.qommon.form import TextWidget
-from wcs.qommon.form import WidgetList
 from wcs.roles import get_user_roles
 
 

wcs/admin/root.py

@@ -14,8 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from quixote import get_request
+from quixote import get_request, redirect
-from quixote import redirect
 from quixote.directory import Directory
 
 

wcs/admin/settings.py

@@ -28,29 +28,17 @@ import shutil
 import xml.etree.ElementTree as ET
 import zipfile
 
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_bytes, force_text
-from django.utils.encoding import force_text
+from quixote import get_publisher, get_request, get_response, get_session, redirect
-from quixote import get_publisher
-from quixote import get_request
-from quixote import get_response
-from quixote import get_session
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.backoffice.studio import StudioDirectory
 from wcs.blocks import BlockDef
 from wcs.carddef import CardDef
 from wcs.data_sources import NamedDataSource
 from wcs.formdef import FormDef
-from wcs.qommon import N_
+from wcs.qommon import N_, _, errors, get_cfg, ident, misc, template
-from wcs.qommon import _
-from wcs.qommon import errors
-from wcs.qommon import get_cfg
-from wcs.qommon import ident
-from wcs.qommon import misc
-from wcs.qommon import template
 from wcs.qommon.admin.cfg import cfg_submit
 from wcs.qommon.admin.emails import EmailsDirectory
 from wcs.qommon.admin.logger import LoggerDirectory
@@ -59,27 +47,27 @@ from wcs.qommon.admin.settings import SettingsDirectory as QommonSettingsDirecto
 from wcs.qommon.admin.texts import TextsDirectory
 from wcs.qommon.afterjobs import AfterJob
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import CheckboxesTableWidget
+from wcs.qommon.form import (
-from wcs.qommon.form import CheckboxesWidget
+    CheckboxesTableWidget,
-from wcs.qommon.form import CheckboxWidget
+    CheckboxesWidget,
-from wcs.qommon.form import ComputedExpressionWidget
+    CheckboxWidget,
-from wcs.qommon.form import FileWidget
+    ComputedExpressionWidget,
-from wcs.qommon.form import Form
+    FileWidget,
-from wcs.qommon.form import IntWidget
+    Form,
-from wcs.qommon.form import MapWidget
+    IntWidget,
-from wcs.qommon.form import PasswordWidget
+    MapWidget,
-from wcs.qommon.form import SingleSelectWidget
+    PasswordWidget,
-from wcs.qommon.form import StringWidget
+    SingleSelectWidget,
-from wcs.qommon.form import TextWidget
+    StringWidget,
-from wcs.qommon.form import UrlWidget
+    TextWidget,
-from wcs.qommon.form import WidgetList
+    UrlWidget,
-from wcs.workflows import Workflow
+    WidgetList,
-from wcs.workflows import WorkflowImportError
+)
+from wcs.workflows import Workflow, WorkflowImportError
 
 from .api_access import ApiAccessDirectory
 from .data_sources import NamedDataSourcesDirectory
-from .fields import FieldDefPage
+from .fields import FieldDefPage, FieldsDirectory
-from .fields import FieldsDirectory
 from .wscalls import NamedWsCallsDirectory
 
 
@@ -953,8 +941,7 @@ class SettingsDirectory(QommonSettingsDirectory):
         return r.getvalue()
 
     def template_submit(self, form=None):
-        from wcs.qommon.template import DEFAULT_TEMPLATE_EZT
+        from wcs.qommon.template import DEFAULT_TEMPLATE_EZT, get_default_ezt_template
-        from wcs.qommon.template import get_default_ezt_template
 
         theme_default_template_ezt = get_default_ezt_template()
 

wcs/admin/users.py

@@ -14,36 +14,26 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from quixote import get_publisher
+from quixote import get_publisher, get_request, get_response, get_session, redirect
-from quixote import get_request
-from quixote import get_response
-from quixote import get_session
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 import wcs.qommon.storage as st
-from wcs.qommon import N_
+from wcs.qommon import N_, _, errors, force_str, get_cfg, ident, misc
-from wcs.qommon import _
-from wcs.qommon import errors
-from wcs.qommon import force_str
-from wcs.qommon import get_cfg
-from wcs.qommon import ident
-from wcs.qommon import misc
 from wcs.qommon.admin.emails import EmailsDirectory
 from wcs.qommon.admin.menu import error_page
 from wcs.qommon.backoffice.listing import pagination_links
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import CheckboxWidget
+from wcs.qommon.form import (
-from wcs.qommon.form import EmailWidget
+    CheckboxWidget,
-from wcs.qommon.form import Form
+    EmailWidget,
-from wcs.qommon.form import HtmlWidget
+    Form,
-from wcs.qommon.form import SingleSelectWidget
+    HtmlWidget,
-from wcs.qommon.form import StringWidget
+    SingleSelectWidget,
-from wcs.qommon.form import WidgetList
+    StringWidget,
-from wcs.qommon.ident.idp import is_idp_managing_user_attributes
+    WidgetList,
-from wcs.qommon.ident.idp import is_idp_managing_user_roles
+)
+from wcs.qommon.ident.idp import is_idp_managing_user_attributes, is_idp_managing_user_roles
 
 
 class UserUI:

wcs/admin/utils.py

@@ -18,10 +18,8 @@
 
 import time
 
-from quixote import get_publisher
+from quixote import get_publisher, get_request
-from quixote import get_request
+from quixote.html import TemplateIO, htmltext
-from quixote.html import TemplateIO
-from quixote.html import htmltext
 
 from wcs.qommon import _
 from wcs.qommon.misc import localstrftime

wcs/admin/workflows.py

@@ -22,56 +22,48 @@ import io
 import textwrap
 import time
 import xml.etree.ElementTree as ET
-from subprocess import PIPE
+from subprocess import PIPE, Popen
-from subprocess import Popen
 
 from django.utils.encoding import force_bytes
-from quixote import get_publisher
+from quixote import get_publisher, get_request, get_response, get_session, redirect
-from quixote import get_request
-from quixote import get_response
-from quixote import get_session
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.backoffice.snapshots import SnapshotsDirectory
 from wcs.backoffice.studio import StudioDirectory
 from wcs.carddef import CardDef
 from wcs.formdata import Evolution
 from wcs.formdef import FormDef
-from wcs.qommon import N_
+from wcs.qommon import N_, _, errors, force_str, get_logger, misc
-from wcs.qommon import _
-from wcs.qommon import errors
-from wcs.qommon import force_str
-from wcs.qommon import get_logger
-from wcs.qommon import misc
 from wcs.qommon.admin.menu import command_icon
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import CheckboxWidget
+from wcs.qommon.form import (
-from wcs.qommon.form import ColourWidget
+    CheckboxWidget,
-from wcs.qommon.form import CompositeWidget
+    ColourWidget,
-from wcs.qommon.form import FileWidget
+    CompositeWidget,
-from wcs.qommon.form import Form
+    FileWidget,
-from wcs.qommon.form import HtmlWidget
+    Form,
-from wcs.qommon.form import SingleSelectWidget
+    HtmlWidget,
-from wcs.qommon.form import StringWidget
+    SingleSelectWidget,
-from wcs.qommon.form import UrlWidget
+    StringWidget,
-from wcs.qommon.form import VarnameWidget
+    UrlWidget,
-from wcs.qommon.form import WysiwygTextWidget
+    VarnameWidget,
-from wcs.workflows import DuplicateGlobalActionNameError
+    WysiwygTextWidget,
-from wcs.workflows import DuplicateStatusNameError
+)
-from wcs.workflows import Workflow
+from wcs.workflows import (
-from wcs.workflows import WorkflowBackofficeFieldsFormDef
+    DuplicateGlobalActionNameError,
-from wcs.workflows import WorkflowCriticalityLevel
+    DuplicateStatusNameError,
-from wcs.workflows import WorkflowImportError
+    Workflow,
-from wcs.workflows import WorkflowVariablesFieldsFormDef
+    WorkflowBackofficeFieldsFormDef,
-from wcs.workflows import item_classes
+    WorkflowCriticalityLevel,
+    WorkflowImportError,
+    WorkflowVariablesFieldsFormDef,
+    item_classes,
+)
 
 from . import utils
 from .data_sources import NamedDataSourcesDirectory
-from .fields import FieldDefPage
+from .fields import FieldDefPage, FieldsDirectory
-from .fields import FieldsDirectory
 from .logged_errors import LoggedErrorsDirectory
 from .mail_templates import MailTemplatesDirectory
 

wcs/admin/wscalls.py

@@ -16,30 +16,16 @@
 
 import xml.etree.ElementTree as ET
 
-from quixote import get_publisher
+from quixote import get_publisher, get_response, get_session, redirect
-from quixote import get_response
-from quixote import get_session
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.admin import utils
 from wcs.backoffice.snapshots import SnapshotsDirectory
-from wcs.qommon import _
+from wcs.qommon import _, errors, force_str, misc, template
-from wcs.qommon import errors
-from wcs.qommon import force_str
-from wcs.qommon import misc
-from wcs.qommon import template
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import CheckboxWidget
+from wcs.qommon.form import CheckboxWidget, FileWidget, Form, HtmlWidget, StringWidget, TextWidget
-from wcs.qommon.form import FileWidget
+from wcs.wscalls import NamedWsCall, WsCallRequestWidget
-from wcs.qommon.form import Form
-from wcs.qommon.form import HtmlWidget
-from wcs.qommon.form import StringWidget
-from wcs.qommon.form import TextWidget
-from wcs.wscalls import NamedWsCall
-from wcs.wscalls import WsCallRequestWidget
 
 
 class NamedWsCallUI:

wcs/api.py

@@ -21,27 +21,18 @@ import sys
 import time
 import urllib.parse
 
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseBadRequest, JsonResponse
-from django.http import HttpResponseBadRequest
-from django.http import JsonResponse
 from django.utils.encoding import force_text
-from quixote import get_publisher
+from quixote import get_publisher, get_request, get_response, get_session
-from quixote import get_request
-from quixote import get_response
-from quixote import get_session
 from quixote.directory import Directory
 from quixote.errors import MethodNotAllowedError
 
 import wcs.qommon.storage as st
 from wcs.admin.settings import UserFieldsFormDef
-from wcs.api_utils import get_query_flag
+from wcs.api_utils import get_query_flag, get_user_from_api_query_string, is_url_signed, sign_url_auto_orig
-from wcs.api_utils import get_user_from_api_query_string
-from wcs.api_utils import is_url_signed
-from wcs.api_utils import sign_url_auto_orig
 from wcs.carddef import CardDef
 from wcs.categories import Category
-from wcs.conditions import Condition
+from wcs.conditions import Condition, ValidationError
-from wcs.conditions import ValidationError
 from wcs.data_sources import NamedDataSource
 from wcs.data_sources import get_object as get_data_source_object
 from wcs.formdef import FormDef
@@ -53,15 +44,15 @@ from .backoffice.data_management import CardPage as BackofficeCardPage
 from .backoffice.management import FormPage as BackofficeFormPage
 from .backoffice.management import ManagementDirectory
 from .backoffice.submission import SubmissionDirectory
-from .qommon import _
+from .qommon import _, misc
-from .qommon import misc
+from .qommon.errors import (
-from .qommon.errors import AccessForbiddenError
+    AccessForbiddenError,
-from .qommon.errors import ConnectionError
+    ConnectionError,
-from .qommon.errors import TraversalError
+    TraversalError,
-from .qommon.errors import UnknownNameIdAccessForbiddenError
+    UnknownNameIdAccessForbiddenError,
+)
 from .qommon.form import ComputedExpressionWidget
-from .qommon.storage import Equal
+from .qommon.storage import Equal, NotEqual
-from .qommon.storage import NotEqual
 
 
 def posted_json_data_to_formdata_data(formdef, data):

wcs/api_utils.py

@@ -24,15 +24,11 @@ import os
 import random
 import urllib.parse
 
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_bytes, force_text
-from django.utils.encoding import force_text
+from quixote import get_publisher, get_request
-from quixote import get_publisher
-from quixote import get_request
 
 from .api_access import ApiAccess
-from .qommon.errors import AccessForbiddenError
+from .qommon.errors import AccessForbiddenError, HttpResponse401Error, UnknownNameIdAccessForbiddenError
-from .qommon.errors import HttpResponse401Error
-from .qommon.errors import UnknownNameIdAccessForbiddenError
 from .qommon.misc import simplify
 
 DEFAULT_DURATION = 30

wcs/backoffice/cards.py

@@ -16,31 +16,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from quixote import get_publisher
+from quixote import get_publisher, get_response, get_session, redirect
-from quixote import get_response
-from quixote import get_session
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.admin import utils
 from wcs.admin.categories import CardDefCategoriesDirectory
-from wcs.admin.forms import FormDefPage
+from wcs.admin.forms import FormDefPage, FormDefUI, FormsDirectory, OptionsDirectory, html_top
-from wcs.admin.forms import FormDefUI
-from wcs.admin.forms import FormsDirectory
-from wcs.admin.forms import OptionsDirectory
-from wcs.admin.forms import html_top
 from wcs.admin.logged_errors import LoggedErrorsDirectory
 from wcs.carddef import CardDef
 from wcs.categories import CardDefCategory
 from wcs.workflows import Workflow
 
-from ..qommon import N_
+from ..qommon import N_, _
-from ..qommon import _
 from ..qommon.misc import C_
-from ..qommon.storage import NotEqual
+from ..qommon.storage import NotEqual, Null
-from ..qommon.storage import Null
 
 
 class CardDefUI(FormDefUI):

wcs/backoffice/data_management.py

@@ -18,28 +18,18 @@ import csv
 import datetime
 import io
 
-from quixote import get_publisher
+from quixote import get_publisher, get_request, get_response, redirect
-from quixote import get_request
-from quixote import get_response
-from quixote import redirect
 from quixote.html import htmltext
 
 from wcs import fields
 from wcs.carddef import CardDef
 from wcs.categories import CardDefCategory
 
-from ..qommon import N_
+from ..qommon import N_, _, errors, template
-from ..qommon import _
-from ..qommon import errors
-from ..qommon import template
 from ..qommon.afterjobs import AfterJob
 from ..qommon.backoffice.menu import html_top
-from ..qommon.form import FileWidget
+from ..qommon.form import FileWidget, Form
-from ..qommon.form import Form
+from .management import FormBackOfficeStatusPage, FormFillPage, FormPage, ManagementDirectory
-from .management import FormBackOfficeStatusPage
-from .management import FormFillPage
-from .management import FormPage
-from .management import ManagementDirectory
 
 
 class DataManagementDirectory(ManagementDirectory):

wcs/backoffice/management.py

@@ -26,15 +26,9 @@ import zipfile
 
 import vobject
 from django.utils.encoding import force_text
-from quixote import get_publisher
+from quixote import get_publisher, get_request, get_response, get_session, redirect
-from quixote import get_request
-from quixote import get_response
-from quixote import get_session
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmlescape, htmltext
-from quixote.html import htmlescape
-from quixote.html import htmltext
 
 from wcs.admin.settings import UserFieldsFormDef
 from wcs.api_utils import get_user_from_api_query_string
@@ -47,52 +41,43 @@ from wcs.forms.backoffice import FormDefUI
 from wcs.forms.common import FormStatusPage
 from wcs.roles import logged_users_role
 from wcs.variables import LazyFieldVar
-from wcs.workflows import WorkflowStatusItem
+from wcs.workflows import WorkflowStatusItem, template_on_formdata
-from wcs.workflows import template_on_formdata
 
-from ..qommon import N_
+from ..qommon import N_, _, emails, errors, ezt, force_str, get_cfg, get_logger, misc, ngettext, ods, sms
-from ..qommon import _
-from ..qommon import emails
-from ..qommon import errors
-from ..qommon import ezt
-from ..qommon import force_str
-from ..qommon import get_cfg
-from ..qommon import get_logger
-from ..qommon import misc
-from ..qommon import ngettext
-from ..qommon import ods
-from ..qommon import sms
 from ..qommon.admin.emails import EmailsDirectory
 from ..qommon.admin.menu import command_icon
 from ..qommon.afterjobs import AfterJob
 from ..qommon.backoffice.listing import pagination_links
 from ..qommon.backoffice.menu import html_top
 from ..qommon.evalutils import make_datetime
-from ..qommon.form import CheckboxWidget
+from ..qommon.form import (
-from ..qommon.form import DateWidget
+    CheckboxWidget,
-from ..qommon.form import EmailWidget
+    DateWidget,
-from ..qommon.form import Form
+    EmailWidget,
-from ..qommon.form import HiddenWidget
+    Form,
-from ..qommon.form import HtmlWidget
+    HiddenWidget,
-from ..qommon.form import MapWidget
+    HtmlWidget,
-from ..qommon.form import RadiobuttonsWidget
+    MapWidget,
-from ..qommon.form import SingleSelectWidget
+    RadiobuttonsWidget,
-from ..qommon.form import StringWidget
+    SingleSelectWidget,
-from ..qommon.form import TextWidget
+    StringWidget,
-from ..qommon.form import WysiwygTextWidget
+    TextWidget,
-from ..qommon.misc import C_
+    WysiwygTextWidget,
-from ..qommon.misc import ellipsize
+)
-from ..qommon.storage import Contains
+from ..qommon.misc import C_, ellipsize
-from ..qommon.storage import Equal
+from ..qommon.storage import (
-from ..qommon.storage import FtsMatch
+    Contains,
-from ..qommon.storage import GreaterOrEqual
+    Equal,
-from ..qommon.storage import ILike
+    FtsMatch,
-from ..qommon.storage import Intersects
+    GreaterOrEqual,
-from ..qommon.storage import LessOrEqual
+    ILike,
-from ..qommon.storage import NotEqual
+    Intersects,
-from ..qommon.storage import NotNull
+    LessOrEqual,
-from ..qommon.storage import Null
+    NotEqual,
-from ..qommon.storage import Or
+    NotNull,
+    Null,
+    Or,
+)
 from ..qommon.substitution import CompatibilityNamesDict
 from ..qommon.template import Template
 from ..qommon.upload_storage import PicklableUpload

wcs/backoffice/root.py

@@ -17,12 +17,8 @@
 import os
 
 from django.utils.translation import pgettext
-from quixote import get_publisher
+from quixote import get_publisher, get_request, get_response, redirect
-from quixote import get_request
+from quixote.html import TemplateIO, htmltext
-from quixote import get_response
-from quixote import redirect
-from quixote.html import TemplateIO
-from quixote.html import htmltext
 
 import wcs.admin.categories
 import wcs.admin.forms
@@ -32,12 +28,7 @@ import wcs.admin.users
 import wcs.admin.workflows
 from wcs.formdef import FormDef
 
-from ..qommon import N_
+from ..qommon import N_, _, errors, get_cfg, misc, template
-from ..qommon import _
-from ..qommon import errors
-from ..qommon import get_cfg
-from ..qommon import misc
-from ..qommon import template
 from ..qommon.afterjobs import AfterJob
 from ..qommon.backoffice import BackofficeRootDirectory
 from ..qommon.backoffice.menu import html_top

wcs/backoffice/snapshots.py

@@ -14,27 +14,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from quixote import get_publisher
+from quixote import get_publisher, get_response, get_session, redirect
-from quixote import get_response
-from quixote import get_session
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.blocks import BlockDef
 from wcs.carddef import CardDef
 from wcs.data_sources import NamedDataSource
-from wcs.formdef import FormDef
+from wcs.formdef import FormDef, FormdefImportError
-from wcs.formdef import FormdefImportError
+from wcs.qommon import _, errors, misc, template
-from wcs.qommon import _
-from wcs.qommon import errors
-from wcs.qommon import misc
-from wcs.qommon import template
 from wcs.qommon.backoffice.menu import html_top
-from wcs.qommon.form import Form
+from wcs.qommon.form import Form, RadiobuttonsWidget, StringWidget
-from wcs.qommon.form import RadiobuttonsWidget
-from wcs.qommon.form import StringWidget
 from wcs.workflows import Workflow
 from wcs.wscalls import NamedWsCall
 

wcs/backoffice/studio.py

@@ -18,8 +18,7 @@ from quixote import get_publisher
 from quixote.directory import Directory
 
 from wcs.admin.logged_errors import LoggedErrorsDirectory
-from wcs.qommon import _
+from wcs.qommon import _, template
-from wcs.qommon import template
 from wcs.qommon.backoffice.menu import html_top
 from wcs.qommon.form import get_response
 

wcs/backoffice/submission.py

@@ -17,14 +17,9 @@
 import time
 
 from django.utils.safestring import mark_safe
-from quixote import get_publisher
+from quixote import get_publisher, get_request, get_response, get_session, redirect
-from quixote import get_request
-from quixote import get_response
-from quixote import get_session
-from quixote import redirect
 from quixote.directory import Directory
-from quixote.html import TemplateIO
+from quixote.html import TemplateIO, htmltext
-from quixote.html import htmltext
 
 from wcs.categories import Category
 from wcs.formdata import FormData
@@ -32,14 +27,10 @@ from wcs.formdef import FormDef
 from wcs.forms.common import FormStatusPage
 from wcs.forms.root import FormPage as PublicFormFillPage
 
-from ..qommon import _
+from ..qommon import _, errors, misc
-from ..qommon import errors
-from ..qommon import misc
 from ..qommon.backoffice.menu import html_top
-from ..qommon.form import Form
+from ..qommon.form import Form, HtmlWidget
-from ..qommon.form import HtmlWidget
+from ..qommon.storage import Equal, NotEqual
-from ..qommon.storage import Equal
-from ..qommon.storage import NotEqual
 
 
 class RemoveDraftDirectory(Directory):

wcs/blocks.py

@@ -17,18 +17,12 @@
 import uuid
 import xml.etree.ElementTree as ET
 
-from quixote import get_publisher
+from quixote import get_publisher, get_request
-from quixote import get_request
+from quixote.html import htmltag, htmltext
-from quixote.html import htmltag
-from quixote.html import htmltext
 
-from . import data_sources
+from . import data_sources, fields
-from . import fields
+from .qommon import N_, _, misc
-from .qommon import N_
+from .qommon.form import CompositeWidget, WidgetList
-from .qommon import _
-from .qommon import misc
-from .qommon.form import CompositeWidget
-from .qommon.form import WidgetList
 from .qommon.storage import StorableObject
 from .qommon.template import Template
 

wcs/carddef.py

@@ -21,15 +21,10 @@ from quixote import get_publisher
 
 from wcs.carddata import CardData
 from wcs.categories import CardDefCategory
-from wcs.formdef import FormDef
+from wcs.formdef import FormDef, get_formdefs_of_all_kinds
-from wcs.formdef import get_formdefs_of_all_kinds
 
-from .qommon import N_
+from .qommon import N_, _, misc
-from .qommon import _
+from .qommon.storage import Equal, ILike, NotEqual
-from .qommon import misc
-from .qommon.storage import Equal
-from .qommon.storage import ILike
-from .qommon.storage import NotEqual
 from .qommon.template import Template
 
 if not hasattr(types, 'ClassType'):
@@ -96,9 +91,7 @@ class CardDef(FormDef):
     @classmethod
     def get_default_workflow(cls):
         from wcs.wf.remove import RemoveWorkflowStatusItem
-        from wcs.workflows import ChoiceWorkflowStatusItem
+        from wcs.workflows import ChoiceWorkflowStatusItem, EditableWorkflowStatusItem, Workflow
-        from wcs.workflows import EditableWorkflowStatusItem
-        from wcs.workflows import Workflow
 
         workflow = Workflow(name=_('Default (cards)'))
         workflow.id = '_carddef_default'

wcs/compat.py

@@ -20,22 +20,18 @@ from threading import Lock
 
 from django.conf import settings
 from django.http import HttpResponse
-from django.template import TemplateDoesNotExist
+from django.template import TemplateDoesNotExist, loader
-from django.template import loader
 from django.template.response import TemplateResponse
 from django.utils.deprecation import MiddlewareMixin
 from django.views.generic.base import TemplateView
-from quixote import get_publisher
+from quixote import get_publisher, get_request
-from quixote import get_request
 from quixote.errors import PublishError
 from quixote.http_request import Upload
 
 from .publisher import WcsPublisher
-from .qommon import force_str
+from .qommon import force_str, template
-from .qommon import template
 from .qommon.http_request import HTTPRequest
-from .qommon.publisher import get_cfg
+from .qommon.publisher import get_cfg, set_publisher_class
-from .qommon.publisher import set_publisher_class
 
 try:
     import sentry_sdk

wcs/conditions.py

@@ -15,15 +15,11 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import django.template.smartif
-from django.template import Context
+from django.template import Context, Template, TemplateSyntaxError
-from django.template import Template
-from django.template import TemplateSyntaxError
 from django.utils.encoding import force_text
 from quixote import get_publisher
 
-from .qommon import _
+from .qommon import _, force_str, get_logger
-from .qommon import force_str
-from .qommon import get_logger
 
 
 class ValidationError(ValueError):

wcs/context_processors.py

@@ -14,10 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from quixote import get_publisher
+from quixote import get_publisher, get_request, get_response, get_session
-from quixote import get_request
-from quixote import get_response
-from quixote import get_session
 
 
 def get_global_context():

wcs/ctl/backup.py

@@ -18,8 +18,7 @@ import os
 import tarfile
 import time
 
-from ..qommon.ctl import Command
+from ..qommon.ctl import Command, make_option
-from ..qommon.ctl import make_option
 
 
 class CmdBackup(Command):