fixed: escape sequences handling

pyhocon/config_parser.py

@@ -3,6 +3,7 @@
 import socket
 import contextlib
 import codecs
+
 from pyparsing import Forward, Keyword, QuotedString, Word, Literal, Suppress, Regex, Optional, SkipTo, ZeroOrMore, \
     Group, lineno, col, TokenConverter, replaceWith, alphanums, alphas8bit, ParseSyntaxException, StringEnd
 from pyparsing import ParserElement
@@ -156,14 +157,15 @@ class ConfigParser(object):
     """
 
     REPLACEMENTS = {
+        '\\\\': '\\',
         '\\\n': '\n',
         '\\n': '\n',
         '\\r': '\r',
         '\\t': '\t',
         '\\=': '=',
         '\\#': '#',
         '\\!': '!',
-        '\\"': '"'
+        '\\"': '"',
     }
 
     @classmethod
@@ -181,10 +183,14 @@ def parse(cls, content, basedir=None, resolve=True, unresolved_value=DEFAULT_SUB
         :return: a ConfigTree or a list
         """
 
+        unescape_pattern = re.compile(r'\\.')
+
+        def replace_escape_sequence(match):
+            value = match.group(0)
+            return cls.REPLACEMENTS.get(value, value)
+
         def norm_string(value):
-            for k, v in cls.REPLACEMENTS.items():
-                value = value.replace(k, v)
-            return value
+            return unescape_pattern.sub(replace_escape_sequence, value)
 
         def unescape_string(tokens):
             return ConfigUnquotedString(norm_string(tokens[0]))

tests/test_config_parser.py

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 
+import json
 import os
 import mock
 import tempfile
@@ -2104,3 +2105,34 @@ def test_keys_with_slash(self):
         assert 'abc' == config['/abc/cde1']
         assert 'cde' == config['/abc/cde2']
         assert 'fgh' == config['/abc/cde3']
+
+    def test_escape_sequences_json_equivalence(self):
+        """
+        Quoted strings are in the same format as JSON strings,
+        See: https://github.com/lightbend/config/blob/master/HOCON.md#unchanged-from-json
+        """
+        source = r"""
+        {
+            "plain-backslash": "\\",
+            "tab": "\t",
+            "no-tab": "\\t",
+            "newline": "\n",
+            "no-newline": "\\n",
+            "cr": "\r",
+            "no-cr": "\\r",
+            "windows": "c:\\temp"
+        }
+        """
+        expected = {
+            'plain-backslash': '\\',
+            'tab': '\t',
+            'no-tab': '\\t',
+            'newline': '\n',
+            'no-newline': '\\n',
+            'cr': '\r',
+            'no-cr': '\\r',
+            'windows': 'c:\\temp',
+        }
+        config = ConfigFactory.parse_string(source)
+        assert config == expected
+        assert config == json.loads(source)