Fix unquoting values when followed by space

etingof · Aug 18, 2018 · 0076190 · 0076190
1 parent 6dcc472
commit 0076190
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,4 +1,10 @@
 
+
+Revision 0.2.6, released XX-08-2018
+-----------------------------------
+
+- Fixed unquoting values when followed by space
+
 Revision 0.2.5, released 15-08-2018
 -----------------------------------
 

diff --git a/apacheconfig/__init__.py b/apacheconfig/__init__.py
@@ -1,5 +1,5 @@
 # http://www.python.org/dev/peps/pep-0396/
-__version__ = '0.2.5'
+__version__ = '0.2.6'
 
 from contextlib import contextmanager
 

diff --git a/apacheconfig/apacheconfigtool.py b/apacheconfig/apacheconfigtool.py
@@ -167,7 +167,6 @@ def main():
             sys.stderr.write('Malformed defaultconfig %s: %s\n' % (options['defaultconfig'], ex))
             return 1
 
-
     if args.json_input:
 
         with make_loader(**options) as loader:

diff --git a/apacheconfig/lexer.py b/apacheconfig/lexer.py
@@ -163,10 +163,11 @@ def _parse_option_value(token):
         if not option:
             raise ApacheConfigError('Syntax error in option-value pair %s' % token)
         if value:
-            if value[0] == '"' and value[-1] == '"':
-                value = DoubleQuotedString(value[1:-1])
-            if value[0] == "'" and value[-1] == "'":
-                value = SingleQuotedString(value[1:-1])
+            stripped = value.strip()
+            if stripped[0] == '"' and stripped[-1] == '"':
+                value = DoubleQuotedString(stripped[1:-1])
+            if stripped[0] == "'" and stripped[-1] == "'":
+                value = SingleQuotedString(stripped[1:-1])
         if '#' in value:
             value = value.replace('\\#', '#')
         return option, value

diff --git a/tests/unit/test_parser.py b/tests/unit/test_parser.py
@@ -124,7 +124,8 @@ def testOptionAndValueSet(self):
 a =b
 a   b
 a "b"
-a = "b"
+   a = "b"   
+   a =        'b'   
 """
         ApacheConfigLexer = make_lexer()
         ApacheConfigParser = make_parser()
@@ -140,6 +141,7 @@ def testOptionAndValueSet(self):
                                ['statement', 'a', 'b'],
                                ['statement', 'a', 'b'],
                                ['statement', 'a', 'b'],
+                               ['statement', 'a', 'b'],
                                ['statement', 'a', 'b']])
 
     def testBlockWithOptions(self):