From 84236eb324775341ba9d04becf0b05ce87292856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20L=C3=BCcke?= Date: Fri, 10 Jul 2026 00:15:28 +0200 Subject: [PATCH] refactor: beachte, dass in Python Namen von Ordnern und Dateien immer klein geschieben werden Auch vermeide Denglisch --- hangar/mech.py | 2 +- {MechFabrik => mech_factory}/Uml/Mech.puml | 0 {MechFabrik => mech_factory}/Uml/MechStructure.puml | 0 {MechFabrik => mech_factory}/Uml/StrikeProcess.puml | 0 .../Uml/StrikeProcessSequence.puml | 0 {MechFabrik => mech_factory}/__init__.py | 8 ++++---- mech_factory/components/__init__.py | 2 +- {MechFabrik/bauteile => mech_factory/components}/items.py | 0 {MechFabrik => mech_factory}/reader.py | 2 +- {MechFabrik => mech_factory}/tabellen/bauteile.csv | 0 {MechFabrik => mech_factory}/tabellen/reaktoren.csv | 0 {MechFabrik => mech_factory}/tabellen/waffen.csv | 0 tests/test_mech/__init__.py | 4 ++-- tests/test_mech_bau.py | 8 ++++---- tests/test_mech_process.py | 5 +++-- 15 files changed, 16 insertions(+), 15 deletions(-) rename {MechFabrik => mech_factory}/Uml/Mech.puml (100%) rename {MechFabrik => mech_factory}/Uml/MechStructure.puml (100%) rename {MechFabrik => mech_factory}/Uml/StrikeProcess.puml (100%) rename {MechFabrik => mech_factory}/Uml/StrikeProcessSequence.puml (100%) rename {MechFabrik => mech_factory}/__init__.py (96%) rename {MechFabrik/bauteile => mech_factory/components}/items.py (100%) rename {MechFabrik => mech_factory}/reader.py (98%) rename {MechFabrik => mech_factory}/tabellen/bauteile.csv (100%) rename {MechFabrik => mech_factory}/tabellen/reaktoren.csv (100%) rename {MechFabrik => mech_factory}/tabellen/waffen.csv (100%) diff --git a/hangar/mech.py b/hangar/mech.py index ac56b6d..b2843ee 100644 --- a/hangar/mech.py +++ b/hangar/mech.py @@ -1,5 +1,5 @@ -from MechFabrik.bauteile import CriticalStrikeEvent, InnerStructure, Item, StrikeEvent, ZoneNames from events import CriticalStrikeEvent, StrikeEvent +from mech_factory.components import InnerStructure, Item, ZoneNames class Mech(object): diff --git a/MechFabrik/Uml/Mech.puml b/mech_factory/Uml/Mech.puml similarity index 100% rename from MechFabrik/Uml/Mech.puml rename to mech_factory/Uml/Mech.puml diff --git a/MechFabrik/Uml/MechStructure.puml b/mech_factory/Uml/MechStructure.puml similarity index 100% rename from MechFabrik/Uml/MechStructure.puml rename to mech_factory/Uml/MechStructure.puml diff --git a/MechFabrik/Uml/StrikeProcess.puml b/mech_factory/Uml/StrikeProcess.puml similarity index 100% rename from MechFabrik/Uml/StrikeProcess.puml rename to mech_factory/Uml/StrikeProcess.puml diff --git a/MechFabrik/Uml/StrikeProcessSequence.puml b/mech_factory/Uml/StrikeProcessSequence.puml similarity index 100% rename from MechFabrik/Uml/StrikeProcessSequence.puml rename to mech_factory/Uml/StrikeProcessSequence.puml diff --git a/MechFabrik/__init__.py b/mech_factory/__init__.py similarity index 96% rename from MechFabrik/__init__.py rename to mech_factory/__init__.py index 97c0717..3a8e19e 100755 --- a/MechFabrik/__init__.py +++ b/mech_factory/__init__.py @@ -1,7 +1,7 @@ -from Hangar.mech import Mech -from MechFabrik.bauteile import InnerStructure, Area, AreaNames, OuterAmor, ZoneNames -from MechFabrik.bauteile.items import Activator, Cockpit, Gyroskope, Joint, Reaktor, Sensors, Sustainment -from MechFabrik.reader import ComponentReader +from hangar.mech import Mech +from mech_factory.components import InnerStructure, Area, AreaNames, OuterAmor, ZoneNames +from mech_factory.components.items import Activator, Cockpit, Gyroskope, Joint, Reaktor, Sensors, Sustainment +from mech_factory.reader import ComponentReader class MechFabrik(object): diff --git a/mech_factory/components/__init__.py b/mech_factory/components/__init__.py index a51cfce..a6683b8 100755 --- a/mech_factory/components/__init__.py +++ b/mech_factory/components/__init__.py @@ -1,6 +1,6 @@ import enum -from MechFabrik.bauteile.items import Gyroskope, Item, ItemStatus +from mech_factory.components.items import Gyroskope, Item, ItemStatus class ZoneNames(enum.Enum): diff --git a/MechFabrik/bauteile/items.py b/mech_factory/components/items.py similarity index 100% rename from MechFabrik/bauteile/items.py rename to mech_factory/components/items.py diff --git a/MechFabrik/reader.py b/mech_factory/reader.py similarity index 98% rename from MechFabrik/reader.py rename to mech_factory/reader.py index 46f7f60..a2c79fa 100755 --- a/MechFabrik/reader.py +++ b/mech_factory/reader.py @@ -1,7 +1,7 @@ import csv import os.path -from MechFabrik import AreaNames +from mech_factory import AreaNames # noinspection SpellCheckingInspection diff --git a/MechFabrik/tabellen/bauteile.csv b/mech_factory/tabellen/bauteile.csv similarity index 100% rename from MechFabrik/tabellen/bauteile.csv rename to mech_factory/tabellen/bauteile.csv diff --git a/MechFabrik/tabellen/reaktoren.csv b/mech_factory/tabellen/reaktoren.csv similarity index 100% rename from MechFabrik/tabellen/reaktoren.csv rename to mech_factory/tabellen/reaktoren.csv diff --git a/MechFabrik/tabellen/waffen.csv b/mech_factory/tabellen/waffen.csv similarity index 100% rename from MechFabrik/tabellen/waffen.csv rename to mech_factory/tabellen/waffen.csv diff --git a/tests/test_mech/__init__.py b/tests/test_mech/__init__.py index 9072332..c689273 100644 --- a/tests/test_mech/__init__.py +++ b/tests/test_mech/__init__.py @@ -1,7 +1,7 @@ import unittest -from MechFabrik import MechFabrik -from MechFabrik.bauteile import AreaNames, ZoneNames +from mech_factory import MechFabrik +from mech_factory.components import AreaNames, ZoneNames INNER_ARMOR = { AreaNames.HEAD: 3, diff --git a/tests/test_mech_bau.py b/tests/test_mech_bau.py index 6faff79..b985a0d 100755 --- a/tests/test_mech_bau.py +++ b/tests/test_mech_bau.py @@ -1,9 +1,9 @@ import unittest -from Hangar.mech import Mech -from MechFabrik import MechFabrik -from MechFabrik.bauteile import InnerStructure, AreaNames, Area, OuterAmor, Zone, ZoneNames -from MechFabrik.bauteile.items import Cockpit, Gyroskope, Item, ItemTypes, Reaktor +from hangar.mech import Mech +from mech_factory import MechFabrik +from mech_factory.components import InnerStructure, AreaNames, Area, OuterAmor, Zone, ZoneNames +from mech_factory.components.items import Cockpit, Gyroskope, Item, ItemTypes, Reaktor from test_mech import AbstractTestMechAmor, INNER_ARMOR, OUTER_ARMOR diff --git a/tests/test_mech_process.py b/tests/test_mech_process.py index b1a9437..669a554 100755 --- a/tests/test_mech_process.py +++ b/tests/test_mech_process.py @@ -1,7 +1,7 @@ -from MechFabrik.bauteile.items import BigItem, DurableItem, Item, ItemStatus, ItemTypes from events import CriticalStrikeEvent, StrikeEvent +from mech_factory.components.items import BigItem, DurableItem, Item, ItemStatus, ItemTypes from test_mech import AbstractTestMechAmor, INNER_ARMOR, NEXT_OUTER_ZONE, OUTER_ARMOR -from MechFabrik.bauteile import Area, AreaStatus, OuterAmor, StrikeEvent, CriticalStrikeEvent, ZoneNames +from mech_factory.components import Area, AreaStatus, OuterAmor, ZoneNames class TestMechAmor(AbstractTestMechAmor): @@ -95,6 +95,7 @@ class TestMechAmor(AbstractTestMechAmor): self.assertEqual(area.parent, event.zone) self.assertEqual(0, event.hits) + # noinspection PyUnresolvedReferences def test_critical_strike(self): parent = Area() area = Area()