Skip to content

Commit

Permalink
Merge pull request SFTtech#1528 from zoli111/fix-python-style
Browse files Browse the repository at this point in the history
Fix Python styling issues
  • Loading branch information
TheJJ authored Aug 11, 2023
2 parents 9943e64 + 92cecc9 commit 3acf3d6
Show file tree
Hide file tree
Showing 37 changed files with 101 additions and 101 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2019-2022 the openage authors. See copying.md for legal info.
# Copyright 2019-2023 the openage authors. See copying.md for legal info.
#
# pylint: disable=too-many-instance-attributes,too-few-public-methods

Expand All @@ -17,21 +17,21 @@
from openage.convert.entity_object.conversion.combined_sprite import CombinedSprite
from openage.convert.entity_object.conversion.combined_terrain import CombinedTerrain
from openage.convert.entity_object.conversion.stringresource import StringResource
from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationObject,\
from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationObject, \
GenieCivilizationGroup
from openage.convert.entity_object.conversion.aoc.genie_connection import GenieAgeConnection,\
from openage.convert.entity_object.conversion.aoc.genie_connection import GenieAgeConnection, \
GenieBuildingConnection, GenieTechConnection, GenieUnitConnection
from openage.convert.entity_object.conversion.aoc.genie_effect import GenieEffectBundle
from openage.convert.entity_object.conversion.aoc.genie_graphic import GenieGraphic
from openage.convert.entity_object.conversion.aoc.genie_sound import GenieSound
from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechObject,\
AgeUpgrade, BuildingLineUpgrade, BuildingUnlock, CivBonus, GenieTechEffectBundleGroup,\
from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechObject, \
AgeUpgrade, BuildingLineUpgrade, BuildingUnlock, CivBonus, GenieTechEffectBundleGroup, \
InitiatedTech, StatUpgrade, UnitLineUpgrade, UnitUnlock
from openage.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainObject,\
from openage.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainObject, \
GenieTerrainGroup
from openage.convert.entity_object.conversion.aoc.genie_unit import GenieUnitObject,\
GenieAmbientGroup, GenieBuildingLineGroup, GenieMonkGroup, GenieUnitLineGroup,\
GenieUnitTaskGroup, GenieUnitTransformGroup, GenieVariantGroup, GenieVillagerGroup,\
from openage.convert.entity_object.conversion.aoc.genie_unit import GenieUnitObject, \
GenieAmbientGroup, GenieBuildingLineGroup, GenieMonkGroup, GenieUnitLineGroup, \
GenieUnitTaskGroup, GenieUnitTransformGroup, GenieVariantGroup, GenieVillagerGroup, \
GenieGameEntityGroup
from openage.convert.entity_object.export.media_export_request import MediaExportRequest
from openage.convert.entity_object.export.metadata_export import MetadataExport
Expand Down
6 changes: 3 additions & 3 deletions openage/convert/entity_object/conversion/aoc/genie_tech.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2019-2022 the openage authors. See copying.md for legal info.
# Copyright 2019-2023 the openage authors. See copying.md for legal info.

"""
Contains structures and API-like objects for techs from AoC.
Expand All @@ -9,11 +9,11 @@
from ..converter_object import ConverterObject, ConverterObjectGroup

if typing.TYPE_CHECKING:
from openage.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject,\
from openage.convert.entity_object.conversion.aoc.genie_effect import GenieEffectObject, \
GenieEffectBundle
from openage.convert.entity_object.conversion.aoc.genie_object_container\
import GenieObjectContainer
from openage.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup,\
from openage.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \
GenieBuildingLineGroup
from openage.convert.value_object.read.value_members import ValueMember

Expand Down
4 changes: 2 additions & 2 deletions openage/convert/entity_object/conversion/ror/genie_tech.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2022 the openage authors. See copying.md for legal info.
# Copyright 2020-2023 the openage authors. See copying.md for legal info.

"""
Contains structures and API-like objects for techs from RoR.
Expand All @@ -8,7 +8,7 @@
from __future__ import annotations
import typing

from ..aoc.genie_tech import StatUpgrade, AgeUpgrade, UnitLineUpgrade,\
from ..aoc.genie_tech import StatUpgrade, AgeUpgrade, UnitLineUpgrade, \
BuildingLineUpgrade, UnitUnlock, BuildingUnlock

if typing.TYPE_CHECKING:
Expand Down
6 changes: 3 additions & 3 deletions openage/convert/entity_object/conversion/ror/genie_unit.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2022 the openage authors. See copying.md for legal info.
# Copyright 2020-2023 the openage authors. See copying.md for legal info.

"""
Contains structures and API-like objects for game entities from RoR.
Expand All @@ -8,8 +8,8 @@
from __future__ import annotations
import typing

from ..aoc.genie_unit import GenieUnitLineGroup, GenieBuildingLineGroup,\
GenieAmbientGroup, GenieVariantGroup, GenieUnitTaskGroup,\
from ..aoc.genie_unit import GenieUnitLineGroup, GenieBuildingLineGroup, \
GenieAmbientGroup, GenieVariantGroup, GenieUnitTaskGroup, \
GenieVillagerGroup, GenieGarrisonMode

if typing.TYPE_CHECKING:
Expand Down
4 changes: 2 additions & 2 deletions openage/convert/entity_object/conversion/swgbcc/genie_unit.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2022 the openage authors. See copying.md for legal info.
# Copyright 2020-2023 the openage authors. See copying.md for legal info.

"""
Converter objects for SWGB. Reimplements the ConverterObjectGroup
Expand All @@ -7,7 +7,7 @@
from __future__ import annotations
import typing

from ..aoc.genie_unit import GenieUnitLineGroup, GenieUnitTransformGroup,\
from ..aoc.genie_unit import GenieUnitLineGroup, GenieUnitTransformGroup, \
GenieMonkGroup, GenieStackBuildingGroup

if typing.TYPE_CHECKING:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

from .....nyan.nyan_structs import MemberSpecialValue, MemberOperator
from .....util.ordered_set import OrderedSet
from ....entity_object.conversion.aoc.genie_unit import GenieBuildingLineGroup,\
GenieAmbientGroup, GenieGarrisonMode, GenieStackBuildingGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieBuildingLineGroup, \
GenieAmbientGroup, GenieGarrisonMode, GenieStackBuildingGroup, \
GenieUnitLineGroup, GenieMonkGroup, GenieVillagerGroup
from ....entity_object.conversion.combined_sound import CombinedSound
from ....entity_object.conversion.combined_sprite import CombinedSprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


from .....nyan.nyan_structs import MemberSpecialValue
from ....entity_object.conversion.aoc.genie_unit import GenieVillagerGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieVillagerGroup, \
GenieBuildingLineGroup, GenieUnitLineGroup
from ....entity_object.conversion.combined_sound import CombinedSound
from ....entity_object.conversion.converter_object import ConverterObjectGroup, RawAPIObject
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2022 the openage authors. See copying.md for legal info.
# Copyright 2020-2023 the openage authors. See copying.md for legal info.
#
# pylint: disable=too-many-locals,too-many-statements,invalid-name
#
Expand All @@ -12,7 +12,7 @@
from __future__ import annotations
import typing

from ....entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \
GenieBuildingLineGroup
from ....entity_object.conversion.converter_object import RawAPIObject
from ....service.conversion import internal_name_lookups
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
from __future__ import annotations
import typing

from ....entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup,\
GenieBuildingLineGroup, GenieVillagerGroup, GenieAmbientGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup, \
GenieBuildingLineGroup, GenieVillagerGroup, GenieAmbientGroup, \
GenieVariantGroup
from ....entity_object.conversion.converter_object import RawAPIObject
from ....service.conversion import internal_name_lookups
Expand Down
6 changes: 3 additions & 3 deletions openage/convert/processor/conversion/aoc/nyan_subprocessor.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2019-2022 the openage authors. See copying.md for legal info.
# Copyright 2019-2023 the openage authors. See copying.md for legal info.
#
# pylint: disable=too-many-lines,too-many-locals,too-many-statements,too-many-branches
#
Expand All @@ -13,7 +13,7 @@
import typing

from ....entity_object.conversion.aoc.genie_tech import UnitLineUpgrade
from ....entity_object.conversion.aoc.genie_unit import GenieGarrisonMode,\
from ....entity_object.conversion.aoc.genie_unit import GenieGarrisonMode, \
GenieMonkGroup, GenieStackBuildingGroup
from ....entity_object.conversion.aoc.genie_unit import GenieVillagerGroup
from ....entity_object.conversion.combined_terrain import CombinedTerrain
Expand All @@ -32,7 +32,7 @@
from openage.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer
from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup
from openage.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainGroup
from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup,\
from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup, \
GenieUnitLineGroup, GenieBuildingLineGroup, GenieAmbientGroup, GenieVariantGroup


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import typing

from .....nyan.nyan_structs import MemberSpecialValue
from ....entity_object.conversion.converter_object import RawAPIObject,\
from ....entity_object.conversion.converter_object import RawAPIObject, \
ConverterObjectGroup
from ....service.conversion import internal_name_lookups
from ....value_object.conversion.forward_ref import ForwardRef
Expand Down
20 changes: 10 additions & 10 deletions openage/convert/processor/conversion/aoc/processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,35 @@
from .....log import info
from ....entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup
from ....entity_object.conversion.aoc.genie_civ import GenieCivilizationObject
from ....entity_object.conversion.aoc.genie_connection import GenieAgeConnection,\
from ....entity_object.conversion.aoc.genie_connection import GenieAgeConnection, \
GenieBuildingConnection, GenieUnitConnection, GenieTechConnection
from ....entity_object.conversion.aoc.genie_effect import GenieEffectObject,\
from ....entity_object.conversion.aoc.genie_effect import GenieEffectObject, \
GenieEffectBundle
from ....entity_object.conversion.aoc.genie_graphic import GenieGraphic
from ....entity_object.conversion.aoc.genie_object_container import GenieObjectContainer
from ....entity_object.conversion.aoc.genie_sound import GenieSound
from ....entity_object.conversion.aoc.genie_tech import AgeUpgrade,\
from ....entity_object.conversion.aoc.genie_tech import AgeUpgrade, \
UnitUnlock, UnitLineUpgrade, CivBonus
from ....entity_object.conversion.aoc.genie_tech import BuildingLineUpgrade
from ....entity_object.conversion.aoc.genie_tech import GenieTechObject
from ....entity_object.conversion.aoc.genie_tech import StatUpgrade, InitiatedTech,\
from ....entity_object.conversion.aoc.genie_tech import StatUpgrade, InitiatedTech, \
BuildingUnlock
from ....entity_object.conversion.aoc.genie_terrain import GenieTerrainGroup
from ....entity_object.conversion.aoc.genie_terrain import GenieTerrainObject
from ....entity_object.conversion.aoc.genie_unit import GenieAmbientGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieAmbientGroup, \
GenieGarrisonMode
from ....entity_object.conversion.aoc.genie_unit import GenieStackBuildingGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieStackBuildingGroup, \
GenieBuildingLineGroup
from ....entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \
GenieUnitTransformGroup, GenieMonkGroup
from ....entity_object.conversion.aoc.genie_unit import GenieUnitObject
from ....entity_object.conversion.aoc.genie_unit import GenieUnitTaskGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieUnitTaskGroup, \
GenieVillagerGroup
from ....entity_object.conversion.aoc.genie_unit import GenieVariantGroup
from ....service.debug_info import debug_converter_objects,\
from ....service.debug_info import debug_converter_objects, \
debug_converter_object_groups
from ....service.read.nyan_api_loader import load_api
from ....value_object.conversion.aoc.internal_nyan_names import AMBIENT_GROUP_LOOKUPS,\
from ....value_object.conversion.aoc.internal_nyan_names import AMBIENT_GROUP_LOOKUPS, \
VARIANT_GROUP_LOOKUPS
from .media_subprocessor import AoCMediaSubprocessor
from .modpack_subprocessor import AoCModpackSubprocessor
Expand Down
4 changes: 2 additions & 2 deletions openage/convert/processor/conversion/aoc/tech_subprocessor.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

from openage.log import warn
from .....nyan.nyan_structs import MemberOperator
from ....entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup,\
from ....entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup, \
CivTeamBonus, CivBonus
from ....entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \
GenieBuildingLineGroup
from ....entity_object.conversion.converter_object import RawAPIObject
from ....service.conversion import internal_name_lookups
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from .....nyan.nyan_structs import MemberOperator, MemberSpecialValue
from ....entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup
from ....entity_object.conversion.aoc.genie_unit import GenieBuildingLineGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieBuildingLineGroup, \
GenieVariantGroup, GenieUnitLineGroup
from ....entity_object.conversion.combined_sound import CombinedSound
from ....entity_object.conversion.combined_sprite import CombinedSprite
Expand All @@ -28,9 +28,9 @@
from .upgrade_effect_subprocessor import AoCUpgradeEffectSubprocessor

if typing.TYPE_CHECKING:
from openage.convert.entity_object.conversion.converter_object import ConverterObject,\
from openage.convert.entity_object.conversion.converter_object import ConverterObject, \
ConverterObjectGroup
from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup,\
from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup, \
GenieUnitObject


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from ....entity_object.conversion.converter_object import RawAPIObject
from ....service.conversion import internal_name_lookups
from ....value_object.conversion.forward_ref import ForwardRef
from ....value_object.read.value_members import NoDiffMember,\
from ....value_object.read.value_members import NoDiffMember, \
LeftMissingMember, RightMissingMember

if typing.TYPE_CHECKING:
Expand Down
4 changes: 2 additions & 2 deletions openage/convert/processor/conversion/de1/processor.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2022 the openage authors. See copying.md for legal info.
# Copyright 2021-2023 the openage authors. See copying.md for legal info.

"""
Convert data from DE1 to openage formats.
Expand All @@ -10,7 +10,7 @@
from .....log import info
from ....entity_object.conversion.aoc.genie_graphic import GenieGraphic
from ....entity_object.conversion.aoc.genie_object_container import GenieObjectContainer
from ....service.debug_info import debug_converter_objects,\
from ....service.debug_info import debug_converter_objects, \
debug_converter_object_groups
from ....service.read.nyan_api_loader import load_api
from ..aoc.processor import AoCProcessor
Expand Down
6 changes: 3 additions & 3 deletions openage/convert/processor/conversion/de2/nyan_subprocessor.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2022 the openage authors. See copying.md for legal info.
# Copyright 2020-2023 the openage authors. See copying.md for legal info.
#
# pylint: disable=too-many-lines,too-many-locals,too-many-statements,too-many-branches
#
Expand All @@ -12,7 +12,7 @@
import typing

from ....entity_object.conversion.aoc.genie_tech import UnitLineUpgrade
from ....entity_object.conversion.aoc.genie_unit import GenieVillagerGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieVillagerGroup, \
GenieGarrisonMode, GenieMonkGroup, GenieStackBuildingGroup
from ....entity_object.conversion.combined_terrain import CombinedTerrain
from ....entity_object.conversion.converter_object import RawAPIObject
Expand All @@ -32,7 +32,7 @@
from openage.convert.entity_object.conversion.aoc.genie_object_container import GenieObjectContainer
from openage.convert.entity_object.conversion.aoc.genie_tech import GenieTechEffectBundleGroup
from openage.convert.entity_object.conversion.aoc.genie_terrain import GenieTerrainGroup
from openage.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup,\
from openage.convert.entity_object.conversion.aoc.genie_unit import GenieUnitLineGroup, \
GenieBuildingLineGroup


Expand Down
6 changes: 3 additions & 3 deletions openage/convert/processor/conversion/de2/processor.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2022 the openage authors. See copying.md for legal info.
# Copyright 2020-2023 the openage authors. See copying.md for legal info.
#
# pylint: disable=line-too-long,too-many-lines,too-many-branches,too-many-statements
"""
Expand All @@ -16,9 +16,9 @@
from .....util.ordered_set import OrderedSet
from ....entity_object.conversion.aoc.genie_graphic import GenieGraphic
from ....entity_object.conversion.aoc.genie_object_container import GenieObjectContainer
from ....entity_object.conversion.aoc.genie_unit import GenieBuildingLineGroup, GenieUnitObject, GenieAmbientGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieBuildingLineGroup, GenieUnitObject, GenieAmbientGroup, \
GenieVariantGroup
from ....service.debug_info import debug_converter_objects,\
from ....service.debug_info import debug_converter_objects, \
debug_converter_object_groups
from ....service.read.nyan_api_loader import load_api
from ..aoc.pregen_processor import AoCPregenSubprocessor
Expand Down
4 changes: 2 additions & 2 deletions openage/convert/processor/conversion/hd/processor.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2022 the openage authors. See copying.md for legal info.
# Copyright 2021-2023 the openage authors. See copying.md for legal info.
#
# pylint: disable=too-few-public-methods

Expand All @@ -11,7 +11,7 @@

from .....log import info
from ....entity_object.conversion.aoc.genie_object_container import GenieObjectContainer
from ....service.debug_info import debug_converter_objects,\
from ....service.debug_info import debug_converter_objects, \
debug_converter_object_groups
from ....service.read.nyan_api_loader import load_api
from ..aoc.nyan_subprocessor import AoCNyanSubprocessor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

from math import degrees

from ....entity_object.conversion.aoc.genie_unit import GenieBuildingLineGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieBuildingLineGroup, \
GenieVillagerGroup, GenieUnitLineGroup
from ....entity_object.conversion.converter_object import RawAPIObject
from ....service.conversion import internal_name_lookups
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2022 the openage authors. See copying.md for legal info.
# Copyright 2020-2023 the openage authors. See copying.md for legal info.
#
# pylint: disable=line-too-long,too-many-locals,too-many-branches,too-many-statements
# pylint: disable=too-few-public-methods
Expand All @@ -11,7 +11,7 @@
import typing

from .....nyan.nyan_structs import MemberSpecialValue
from ....entity_object.conversion.aoc.genie_unit import GenieVillagerGroup,\
from ....entity_object.conversion.aoc.genie_unit import GenieVillagerGroup, \
GenieBuildingLineGroup, GenieUnitLineGroup
from ....entity_object.conversion.combined_sound import CombinedSound
from ....entity_object.conversion.converter_object import RawAPIObject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from __future__ import annotations
import typing

from ....entity_object.conversion.converter_object import ConverterObjectGroup,\
from ....entity_object.conversion.converter_object import ConverterObjectGroup, \
RawAPIObject
from ....value_object.conversion.forward_ref import ForwardRef
from ..aoc.pregen_processor import AoCPregenSubprocessor
Expand Down
Loading

0 comments on commit 3acf3d6

Please sign in to comment.