Improve consistency in naming of AB and AM nodes

Argmaster · Jan 29, 2025 · b7c8c99 · b7c8c99
1 parent 32fec9e
commit b7c8c99
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and
 this project adheres to [Semantic Versioning 2.0.0](https://semver.org/).
 
+## Pre-Release 3.0.0b1
+
+- Changed `pygerber.gerber.ast.nodes.aperture.AM_open` to
+  `pygerber.gerber.ast.nodes.aperture.AMopen` for consistency.
+- Changed `pygerber.gerber.ast.nodes.aperture.AM_close` to
+  `pygerber.gerber.ast.nodes.aperture.AMclose` for consistency.
+- Changed `pygerber.gerber.ast.nodes.aperture.AB_open` to
+  `pygerber.gerber.ast.nodes.aperture.ABopen` for consistency.
+- Changed `pygerber.gerber.ast.nodes.aperture.AB_close` to
+  `pygerber.gerber.ast.nodes.aperture.ABclose` for consistency.
+
 ## Pre-Release 3.0.0a4
 
 - Relaxed `pyparsing` dependency requirements to allow for use of `3.2` and above for

diff --git a/src/pygerber/gerber/ast/nodes/__init__.py b/src/pygerber/gerber/ast/nodes/__init__.py
@@ -5,17 +5,17 @@
 from __future__ import annotations
 
 from pygerber.gerber.ast.nodes.aperture.AB import AB
-from pygerber.gerber.ast.nodes.aperture.AB_close import ABclose
-from pygerber.gerber.ast.nodes.aperture.AB_open import ABopen
+from pygerber.gerber.ast.nodes.aperture.ABclose import ABclose
+from pygerber.gerber.ast.nodes.aperture.ABopen import ABopen
 from pygerber.gerber.ast.nodes.aperture.AD import AD
 from pygerber.gerber.ast.nodes.aperture.ADC import ADC
 from pygerber.gerber.ast.nodes.aperture.ADmacro import ADmacro
 from pygerber.gerber.ast.nodes.aperture.ADO import ADO
 from pygerber.gerber.ast.nodes.aperture.ADP import ADP
 from pygerber.gerber.ast.nodes.aperture.ADR import ADR
 from pygerber.gerber.ast.nodes.aperture.AM import AM
-from pygerber.gerber.ast.nodes.aperture.AM_close import AMclose
-from pygerber.gerber.ast.nodes.aperture.AM_open import AMopen
+from pygerber.gerber.ast.nodes.aperture.AMclose import AMclose
+from pygerber.gerber.ast.nodes.aperture.AMopen import AMopen
 from pygerber.gerber.ast.nodes.aperture.SR import SR
 from pygerber.gerber.ast.nodes.aperture.SR_close import SRclose
 from pygerber.gerber.ast.nodes.aperture.SR_open import SRopen

diff --git a/src/pygerber/gerber/ast/nodes/aperture/AB.py b/src/pygerber/gerber/ast/nodes/aperture/AB.py
@@ -4,8 +4,8 @@
 
 from typing import TYPE_CHECKING, Callable, List
 
-from pygerber.gerber.ast.nodes.aperture.AB_close import ABclose
-from pygerber.gerber.ast.nodes.aperture.AB_open import ABopen
+from pygerber.gerber.ast.nodes.aperture.ABclose import ABclose
+from pygerber.gerber.ast.nodes.aperture.ABopen import ABopen
 from pygerber.gerber.ast.nodes.base import Node
 
 if TYPE_CHECKING:

diff --git a/...ber/gerber/ast/nodes/aperture/AB_close.py → ...rber/gerber/ast/nodes/aperture/ABclose.py b/...ber/gerber/ast/nodes/aperture/AB_close.py → ...rber/gerber/ast/nodes/aperture/ABclose.py
diff --git a/...rber/gerber/ast/nodes/aperture/AB_open.py → ...erber/gerber/ast/nodes/aperture/ABopen.py b/...rber/gerber/ast/nodes/aperture/AB_open.py → ...erber/gerber/ast/nodes/aperture/ABopen.py
diff --git a/src/pygerber/gerber/ast/nodes/aperture/AM.py b/src/pygerber/gerber/ast/nodes/aperture/AM.py
@@ -4,8 +4,8 @@
 
 from typing import TYPE_CHECKING, Callable, List
 
-from pygerber.gerber.ast.nodes.aperture.AM_close import AMclose
-from pygerber.gerber.ast.nodes.aperture.AM_open import AMopen
+from pygerber.gerber.ast.nodes.aperture.AMclose import AMclose
+from pygerber.gerber.ast.nodes.aperture.AMopen import AMopen
 from pygerber.gerber.ast.nodes.base import Node
 
 if TYPE_CHECKING:

diff --git a/...ber/gerber/ast/nodes/aperture/AM_close.py → ...rber/gerber/ast/nodes/aperture/AMclose.py b/...ber/gerber/ast/nodes/aperture/AM_close.py → ...rber/gerber/ast/nodes/aperture/AMclose.py
diff --git a/...rber/gerber/ast/nodes/aperture/AM_open.py → ...erber/gerber/ast/nodes/aperture/AMopen.py b/...rber/gerber/ast/nodes/aperture/AM_open.py → ...erber/gerber/ast/nodes/aperture/AMopen.py
diff --git a/test/unit/test_gerber/test_ast/test_ast_visitor.py b/test/unit/test_gerber/test_ast/test_ast_visitor.py
@@ -8,15 +8,15 @@
 import tzlocal
 
 from pygerber.gerber.ast.ast_visitor import AstVisitor
-from pygerber.gerber.ast.nodes.aperture.AB_close import ABclose
-from pygerber.gerber.ast.nodes.aperture.AB_open import ABopen
+from pygerber.gerber.ast.nodes.aperture.ABclose import ABclose
+from pygerber.gerber.ast.nodes.aperture.ABopen import ABopen
 from pygerber.gerber.ast.nodes.aperture.ADC import ADC
 from pygerber.gerber.ast.nodes.aperture.ADmacro import ADmacro
 from pygerber.gerber.ast.nodes.aperture.ADO import ADO
 from pygerber.gerber.ast.nodes.aperture.ADP import ADP
 from pygerber.gerber.ast.nodes.aperture.ADR import ADR
-from pygerber.gerber.ast.nodes.aperture.AM_close import AMclose
-from pygerber.gerber.ast.nodes.aperture.AM_open import AMopen
+from pygerber.gerber.ast.nodes.aperture.AMclose import AMclose
+from pygerber.gerber.ast.nodes.aperture.AMopen import AMopen
 from pygerber.gerber.ast.nodes.aperture.SR_close import SRclose
 from pygerber.gerber.ast.nodes.aperture.SR_open import SRopen
 from pygerber.gerber.ast.nodes.attribute.TA import (