diff options
Diffstat (limited to 'reconfigure/parsers')
-rw-r--r-- | reconfigure/parsers/bind9.py | 2 | ||||
-rw-r--r-- | reconfigure/parsers/exports.py | 4 | ||||
-rw-r--r-- | reconfigure/parsers/iniparse/ini.py | 4 | ||||
-rw-r--r-- | reconfigure/parsers/nginx.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/reconfigure/parsers/bind9.py b/reconfigure/parsers/bind9.py index ab089c4..e31a433 100644 --- a/reconfigure/parsers/bind9.py +++ b/reconfigure/parsers/bind9.py @@ -8,7 +8,7 @@ class BIND9Parser (NginxParser): """ tokens = [ - (r"(acl|key|masters|server|trusted-keys|managed-keys|controls|logging|lwres|options|view|zone|inet|channel|category|listen-on|search|avoid-v4-udp-ports|avoid-v6-udp-ports|blackhole|listen-on|listen-on-v6|allow-recursion|allow-recursion-on|sortlist|topology|rrset-order|dual-stack-servers|disable-algorithms|dns64|forwarders|rrset-order|update-policy|also-notify|allow-notify|rate-limit)\s+?([^\s{}]*\s*)*{", lambda s, t: ('section_start', t)), + (r"(acl|key|masters|server|trusted-keys|managed-keys|controls|logging|lwres|options|view|zone|channel|category|listen-on|search|avoid-v4-udp-ports|avoid-v6-udp-ports|blackhole|listen-on|listen-on-v6|allow-recursion|allow-recursion-on|sortlist|topology|rrset-order|dual-stack-servers|disable-algorithms|dns64|forwarders|rrset-order|update-policy|also-notify|allow-notify|rate-limit)\s+?([^\s{}]*\s*)*{", lambda s, t: ('section_start', t)), (r"\#.*?\n", lambda s, t: ('comment', t)), (r"//.*?\n", lambda s, t: ('comment', t)), (r"/\*.*?\*/", lambda s, t: ('comment', t)), diff --git a/reconfigure/parsers/exports.py b/reconfigure/parsers/exports.py index 1941f61..75e680d 100644 --- a/reconfigure/parsers/exports.py +++ b/reconfigure/parsers/exports.py @@ -16,7 +16,7 @@ class ExportsParser (BaseParser): tree = self.inner.parse(content) root = RootNode() for export in tree: - export_node = Node(export[0].get('value').value) + export_node = Node(export[0].get('value').value.strip('"')) export_node.comment = export.comment clients_node = Node('clients') export_node.append(clients_node) @@ -37,7 +37,7 @@ class ExportsParser (BaseParser): root = RootNode() for export in tree: export_node = Node('line', comment=export.comment) - export_node.append(Node('token', PropertyNode('value', export.name))) + export_node.append(Node('token', PropertyNode('value', '"%s"' % export.name))) for client in export['clients']: s = client.name if client['options'].value: diff --git a/reconfigure/parsers/iniparse/ini.py b/reconfigure/parsers/iniparse/ini.py index 84611ba..aeba8e9 100644 --- a/reconfigure/parsers/iniparse/ini.py +++ b/reconfigure/parsers/iniparse/ini.py @@ -127,8 +127,8 @@ class OptionLine(LineType): out = out + self.comment_separator + self.comment return out - regex = re.compile(r'^(?P<name>[^:=\s[][^:=]*)' - r'(?P<sep>[:=]\s*)' + regex = re.compile(r'^(?P<name>[^=\s[][^=]*)' + r'(?P<sep>[=]\s*)' r'(?P<value>.*)$') def parse(cls, line): diff --git a/reconfigure/parsers/nginx.py b/reconfigure/parsers/nginx.py index f0fe202..421a483 100644 --- a/reconfigure/parsers/nginx.py +++ b/reconfigure/parsers/nginx.py @@ -23,7 +23,7 @@ class NginxParser (BaseParser): scanner = re.Scanner(self.tokens) tokens, remainder = scanner.scan(' '.join(filter(None, content.split(' ')))) if remainder: - raise Exception('Invalid tokens: %s' % remainder) + raise Exception('Invalid tokens: %s. Tokens: %s' % (remainder, tokens)) node = RootNode() node.parameter = None |