summaryrefslogtreecommitdiff
path: root/gerber
diff options
context:
space:
mode:
authorHamilton Kibbe <hamilton.kibbe@gmail.com>2015-01-26 22:24:45 -0500
committerHamilton Kibbe <hamilton.kibbe@gmail.com>2015-01-26 22:24:45 -0500
commit208149d6769e608918e04977a5af110bce9c5bd6 (patch)
tree5a9fd462219dda5c36067fb3db7dc2467e8a0861 /gerber
parentc054136a6531404e3b20aadbc7fba2ec25b50a4a (diff)
downloadgerbonara-208149d6769e608918e04977a5af110bce9c5bd6.tar.gz
gerbonara-208149d6769e608918e04977a5af110bce9c5bd6.tar.bz2
gerbonara-208149d6769e608918e04977a5af110bce9c5bd6.zip
merge upstream changes
Diffstat (limited to 'gerber')
-rw-r--r--gerber/gerber_statements.py2
-rw-r--r--gerber/rs274x.py2
-rw-r--r--gerber/tests/test_gerber_statements.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/gerber/gerber_statements.py b/gerber/gerber_statements.py
index 3419948..d84b5e0 100644
--- a/gerber/gerber_statements.py
+++ b/gerber/gerber_statements.py
@@ -281,7 +281,7 @@ class ADParamStmt(ParamStmt):
elif self.shape == 'R':
shape = 'rectangle'
elif self.shape == 'O':
- shape = 'oblong'
+ shape = 'obround'
else:
shape = self.shape
diff --git a/gerber/rs274x.py b/gerber/rs274x.py
index 2e5a3ec..abd7366 100644
--- a/gerber/rs274x.py
+++ b/gerber/rs274x.py
@@ -113,6 +113,7 @@ class GerberFile(CamFile):
f.write("\n")
+
class GerberParser(object):
""" GerberParser
"""
@@ -156,6 +157,7 @@ class GerberParser(object):
APERTURE_STMT = re.compile(r"(?P<deprecated>(G54)|G55)?D(?P<d>\d+)\*")
+
COMMENT_STMT = re.compile(r"G04(?P<comment>[^*]*)(\*)?")
EOF_STMT = re.compile(r"(?P<eof>M02)\*")
diff --git a/gerber/tests/test_gerber_statements.py b/gerber/tests/test_gerber_statements.py
index c346ace..ff967f9 100644
--- a/gerber/tests/test_gerber_statements.py
+++ b/gerber/tests/test_gerber_statements.py
@@ -411,4 +411,4 @@ def test_ADParamStmt_string():
stmt = {'param': 'AD', 'd': 2, 'shape': 'O'}
ad = ADParamStmt.from_dict(stmt)
- assert_equal(str(ad), '<Aperture Definition: 2: obround')
+ assert_equal(str(ad), '<Aperture Definition: 2: obround>')