From 738bbc7edda0d8006ef4ff8159144ff3cf03d3ba Mon Sep 17 00:00:00 2001
From: Qau Lau <qaulau@hotmail.com>
Date: Tue, 22 Mar 2016 17:30:20 +0800
Subject: Update rs274x.py

python 2.6 bug re incompatibility in sre, see https://bugs.python.org/issue214033
---
 gerber/rs274x.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gerber')

diff --git a/gerber/rs274x.py b/gerber/rs274x.py
index 692ce71..742fddd 100644
--- a/gerber/rs274x.py
+++ b/gerber/rs274x.py
@@ -168,11 +168,11 @@ class GerberParser(object):
     FS = r"(?P<param>FS)(?P<zero>(L|T|D))?(?P<notation>(A|I))X(?P<x>[0-7][0-7])Y(?P<y>[0-7][0-7])"
     MO = r"(?P<param>MO)(?P<mo>(MM|IN))"
     LP = r"(?P<param>LP)(?P<lp>(D|C))"
-    AD_CIRCLE = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>C)[,]?(?P<modifiers>[^,%]*)?"
+    AD_CIRCLE = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>C)[,]?(?P<modifiers>[^,%]*)"
     AD_RECT = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>R)[,](?P<modifiers>[^,%]*)"
     AD_OBROUND = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>O)[,](?P<modifiers>[^,%]*)"
     AD_POLY = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>P)[,](?P<modifiers>[^,%]*)"
-    AD_MACRO = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>{name})[,]?(?P<modifiers>[^,%]*)?".format(name=NAME)
+    AD_MACRO = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>{name})[,]?(?P<modifiers>[^,%]*)".format(name=NAME)
     AM = r"(?P<param>AM)(?P<name>{name})\*(?P<macro>[^%]*)".format(name=NAME)
 
     # begin deprecated
-- 
cgit