From 277e0f2c38b769e20880ea73101ade5881a0c17d Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Wed, 22 Jun 2022 22:50:57 +0200 Subject: [PATCH] Rename WallMountedBox to _WallMountedBox as it is an abstract class and should not appear in the list of generators. Thanks to https://github.com/HaSHsss for reporting! Resolves: #408 --- boxes/generators/wallcaliperholder.py | 4 ++-- boxes/generators/wallchiselholder.py | 4 ++-- boxes/generators/wallconsole.py | 4 ++-- boxes/generators/walldrillbox.py | 6 +++--- boxes/generators/walledges.py | 4 ++-- boxes/generators/wallpinrow.py | 4 ++-- boxes/generators/wallplaneholder.py | 4 ++-- boxes/generators/wallpliersholder.py | 4 ++-- boxes/generators/wallslottedholder.py | 4 ++-- boxes/generators/wallstairs.py | 4 ++-- boxes/generators/walltypetray.py | 4 ++-- boxes/generators/wallwrenchholder.py | 4 ++-- boxes/walledges.py | 2 +- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/boxes/generators/wallcaliperholder.py b/boxes/generators/wallcaliperholder.py index 0a5e59a..7f1ee0b 100644 --- a/boxes/generators/wallcaliperholder.py +++ b/boxes/generators/wallcaliperholder.py @@ -15,9 +15,9 @@ # along with this program. If not, see . from boxes import * -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox -class WallCaliper(WallMountedBox): +class WallCaliper(_WallMountedBox): """Holds a single caliper to a wall""" def __init__(self): diff --git a/boxes/generators/wallchiselholder.py b/boxes/generators/wallchiselholder.py index 40dd126..e8a60ee 100644 --- a/boxes/generators/wallchiselholder.py +++ b/boxes/generators/wallchiselholder.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox class FrontEdge(edges.Edge): @@ -33,7 +33,7 @@ class FrontEdge(edges.Edge): -class WallChiselHolder(WallMountedBox): +class WallChiselHolder(_WallMountedBox): """Wall tool holder for chisels, files and similar tools""" def __init__(self): diff --git a/boxes/generators/wallconsole.py b/boxes/generators/wallconsole.py index f07490a..39d1169 100644 --- a/boxes/generators/wallconsole.py +++ b/boxes/generators/wallconsole.py @@ -15,9 +15,9 @@ # along with this program. If not, see . from boxes import * -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox -class WallConsole(WallMountedBox): +class WallConsole(_WallMountedBox): """Outset and angled plate to mount stuff to""" def __init__(self): diff --git a/boxes/generators/walldrillbox.py b/boxes/generators/walldrillbox.py index 9112b8e..d9e65ab 100644 --- a/boxes/generators/walldrillbox.py +++ b/boxes/generators/walldrillbox.py @@ -16,13 +16,13 @@ from boxes import * from .drillstand import DrillStand -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox -class WallDrillBox(DrillStand, WallMountedBox): +class WallDrillBox(DrillStand, _WallMountedBox): """Box for drills with each compartment with a different height""" def __init__(self): - WallMountedBox.__init__(self) # don't call DrillStand.__init__ + _WallMountedBox.__init__(self) # don't call DrillStand.__init__ self.addSettingsArgs(edges.StackableSettings, height=1.0, width=3) self.buildArgParser(sx="25*6", sy="10:20:30", sh="25:40:60") diff --git a/boxes/generators/walledges.py b/boxes/generators/walledges.py index b9d5b3b..9369ac3 100644 --- a/boxes/generators/walledges.py +++ b/boxes/generators/walledges.py @@ -15,9 +15,9 @@ # along with this program. If not, see . from boxes import * -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox -class WallEdges(WallMountedBox): +class WallEdges(_WallMountedBox): """Shows the different edge types for wall systems""" def __init__(self): diff --git a/boxes/generators/wallpinrow.py b/boxes/generators/wallpinrow.py index 44fe5b1..8194315 100644 --- a/boxes/generators/wallpinrow.py +++ b/boxes/generators/wallpinrow.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox class PinEdge(edges.BaseEdge): def __call__(self, length, **kw): @@ -37,7 +37,7 @@ class PinEdge(edges.BaseEdge): def margin(self): return self.settings.thickness+self.settings.pinlength -class WallPinRow(WallMountedBox): +class WallPinRow(_WallMountedBox): """Outset and angled plate to mount stuff to""" def __init__(self): diff --git a/boxes/generators/wallplaneholder.py b/boxes/generators/wallplaneholder.py index d4a39f7..d78372a 100644 --- a/boxes/generators/wallplaneholder.py +++ b/boxes/generators/wallplaneholder.py @@ -15,9 +15,9 @@ # along with this program. If not, see . from boxes import * -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox -class WallPlaneHolder(WallMountedBox): +class WallPlaneHolder(_WallMountedBox): """Hold a plane to a wall""" def __init__(self): diff --git a/boxes/generators/wallpliersholder.py b/boxes/generators/wallpliersholder.py index 9a95c4e..cf59736 100644 --- a/boxes/generators/wallpliersholder.py +++ b/boxes/generators/wallpliersholder.py @@ -15,9 +15,9 @@ # along with this program. If not, see . from boxes import * -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox -class WallPliersHolder(WallMountedBox): +class WallPliersHolder(_WallMountedBox): """Bar to hang pliers on""" def __init__(self): diff --git a/boxes/generators/wallslottedholder.py b/boxes/generators/wallslottedholder.py index 45eaeb2..f8db829 100644 --- a/boxes/generators/wallslottedholder.py +++ b/boxes/generators/wallslottedholder.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox class FrontEdge(edges.Edge): @@ -30,7 +30,7 @@ class FrontEdge(edges.Edge): self.polyline(w, (90, r1), ds-r1-r2, (-90, r2), ws-2*r2, (-90, r2), ds-r1-r2, (90, r1), w) -class WallSlottedHolder(WallMountedBox): +class WallSlottedHolder(_WallMountedBox): """Wall tool holder with slots""" def __init__(self): diff --git a/boxes/generators/wallstairs.py b/boxes/generators/wallstairs.py index 15ac395..a64704f 100644 --- a/boxes/generators/wallstairs.py +++ b/boxes/generators/wallstairs.py @@ -15,9 +15,9 @@ # along with this program. If not, see . from boxes import * -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox -class WallStairs(WallMountedBox): +class WallStairs(_WallMountedBox): """Platforms in different heights e.g. for screw drivers""" description = """You are supposed to add holes or slots to the stair tops yourself using Inkscape or another vector drawing or CAD program. diff --git a/boxes/generators/walltypetray.py b/boxes/generators/walltypetray.py index b11fd2f..fb24a26 100644 --- a/boxes/generators/walltypetray.py +++ b/boxes/generators/walltypetray.py @@ -16,9 +16,9 @@ from boxes import * from boxes.lids import _TopEdge -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox -class WallTypeTray(WallMountedBox, _TopEdge): +class WallTypeTray(_WallMountedBox, _TopEdge): """Type tray - allows only continuous walls""" def __init__(self): diff --git a/boxes/generators/wallwrenchholder.py b/boxes/generators/wallwrenchholder.py index 53cf638..93ba6e0 100644 --- a/boxes/generators/wallwrenchholder.py +++ b/boxes/generators/wallwrenchholder.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -from boxes.walledges import WallMountedBox +from boxes.walledges import _WallMountedBox class SlottedEdge(edges.Edge): @@ -42,7 +42,7 @@ class SlottedEdge(edges.Edge): self.polyline(0, -45) self.edge(length-l) -class WallWrenchHolder(WallMountedBox): +class WallWrenchHolder(_WallMountedBox): """Hold a set of wrenches at a wall""" diff --git a/boxes/walledges.py b/boxes/walledges.py index 15c92fd..83c2e1a 100644 --- a/boxes/walledges.py +++ b/boxes/walledges.py @@ -1,7 +1,7 @@ from .edges import Settings, BaseEdge from boxes import Boxes, edges -class WallMountedBox(Boxes): +class _WallMountedBox(Boxes): ui_group = "WallMounted" def __init__(self):