Removed handled vars from values in JP
This commit is contained in:
parent
43ea732c5f
commit
affbbc822d
@ -15,7 +15,7 @@ __title__ = "cpl_core"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -23,4 +23,4 @@ from collections import namedtuple
|
|||||||
# imports:
|
# imports:
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.application"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -29,4 +29,4 @@ from .startup_abc import StartupABC
|
|||||||
from .startup_extension_abc import StartupExtensionABC
|
from .startup_extension_abc import StartupExtensionABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.configuration"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC
|
|||||||
from .variable_argument import VariableArgument
|
from .variable_argument import VariableArgument
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.console"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum
|
|||||||
from .spinner_thread import SpinnerThread
|
from .spinner_thread import SpinnerThread
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
"Version": {
|
"Version": {
|
||||||
"Major": "2023",
|
"Major": "2023",
|
||||||
"Minor": "4",
|
"Minor": "4",
|
||||||
"Micro": "0.post4"
|
"Micro": "0.post5"
|
||||||
},
|
},
|
||||||
"Author": "Sven Heidemann",
|
"Author": "Sven Heidemann",
|
||||||
"AuthorEmail": "sven.heidemann@sh-edraft.de",
|
"AuthorEmail": "sven.heidemann@sh-edraft.de",
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.database"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings
|
|||||||
from .table_abc import TableABC
|
from .table_abc import TableABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.database.connection"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection
|
|||||||
from .database_connection_abc import DatabaseConnectionABC
|
from .database_connection_abc import DatabaseConnectionABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.database.context"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -25,4 +25,4 @@ from .database_context import DatabaseContext
|
|||||||
from .database_context_abc import DatabaseContextABC
|
from .database_context_abc import DatabaseContextABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.dependency_injection"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -31,4 +31,4 @@ from .service_provider import ServiceProvider
|
|||||||
from .service_provider_abc import ServiceProviderABC
|
from .service_provider_abc import ServiceProviderABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.environment"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum
|
|||||||
from .application_environment import ApplicationEnvironment
|
from .application_environment import ApplicationEnvironment
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.logging"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings
|
|||||||
from .logging_settings_name_enum import LoggingSettingsNameEnum
|
from .logging_settings_name_enum import LoggingSettingsNameEnum
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.mailing"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings
|
|||||||
from .email_client_settings_name_enum import EMailClientSettingsNameEnum
|
from .email_client_settings_name_enum import EMailClientSettingsNameEnum
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.pipes"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -26,4 +26,4 @@ from .ip_address_pipe import IPAddressPipe
|
|||||||
from .pipe_abc import PipeABC
|
from .pipe_abc import PipeABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.time"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings
|
|||||||
from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
|
from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.utils"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0.post4"
|
__version__ = "2023.4.0.post5"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -26,4 +26,4 @@ from .string import String
|
|||||||
from .pip import Pip
|
from .pip import Pip
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post4")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post5")
|
||||||
|
@ -22,10 +22,13 @@ class JSONProcessor:
|
|||||||
value = ""
|
value = ""
|
||||||
if name in values:
|
if name in values:
|
||||||
value = values[name]
|
value = values[name]
|
||||||
|
values.pop(name)
|
||||||
elif name_first_lower in values:
|
elif name_first_lower in values:
|
||||||
value = values[name_first_lower]
|
value = values[name_first_lower]
|
||||||
|
values.pop(name_first_lower)
|
||||||
else:
|
else:
|
||||||
value = values[name.upper()]
|
value = values[name.upper()]
|
||||||
|
values.pop(name.upper())
|
||||||
|
|
||||||
if isinstance(value, dict) and not issubclass(parameter.annotation, dict):
|
if isinstance(value, dict) and not issubclass(parameter.annotation, dict):
|
||||||
value = JSONProcessor.process(parameter.annotation, value)
|
value = JSONProcessor.process(parameter.annotation, value)
|
||||||
|
@ -11,11 +11,11 @@ CPL translation extension
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__title__ = "cpl_translation"
|
__title__ = 'cpl_translation'
|
||||||
__author__ = "Sven Heidemann"
|
__author__ = 'Sven Heidemann'
|
||||||
__license__ = "MIT"
|
__license__ = 'MIT'
|
||||||
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
|
__copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de'
|
||||||
__version__ = "2023.4.0.post1"
|
__version__ = '2023.4.0.post1'
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -25,7 +25,6 @@ from .translate_pipe import TranslatePipe
|
|||||||
from .translation_service import TranslationService
|
from .translation_service import TranslationService
|
||||||
from .translation_service_abc import TranslationServiceABC
|
from .translation_service_abc import TranslationServiceABC
|
||||||
from .translation_settings import TranslationSettings
|
from .translation_settings import TranslationSettings
|
||||||
|
|
||||||
# build-ignore
|
# build-ignore
|
||||||
|
|
||||||
|
|
||||||
@ -52,5 +51,5 @@ def init():
|
|||||||
init()
|
init()
|
||||||
# build-ignore-end
|
# build-ignore-end
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
version_info = VersionInfo(major='2023', minor='4', micro='0.post1')
|
||||||
|
Loading…
Reference in New Issue
Block a user