handle #base & #include + extra symbols; #9

ValvePython · Apr 9, 2016 · 86d576f · 86d576f
1 parent 06a9b5c
commit 86d576f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/tests/test_vdf.py b/tests/test_vdf.py
@@ -275,6 +275,27 @@ def test_comments_and_blank_lines(self):
 
  self.assertEqual(vdf.loads(INPUT), EXPECTED)
 
+ def test_hash_key(self):
+ INPUT = '#include "asd.vdf"'
+ EXPECTED = {'#include': 'asd.vdf'}
+
+ self.assertEqual(vdf.loads(INPUT), EXPECTED)
+
+ INPUT = '#base asd.vdf'
+ EXPECTED = {'#base': 'asd.vdf'}
+
+ self.assertEqual(vdf.loads(INPUT), EXPECTED)
+
+ def test_wierd_symbols_for_unquoted(self):
+ INPUT = 'a asd.vdf\nb language_*lol*\nc zxc_-*.sss//'
+ EXPECTED = {
+ 'a': 'asd.vdf',
+ 'b': 'language_*lol*',
+ 'c': 'zxc_-*.sss',
+ }
+
+ self.assertEqual(vdf.loads(INPUT), EXPECTED)
+
 
 class testcase_VDF_other(unittest.TestCase):
  def test_dumps_pretty_output(self):

diff --git a/vdf/__init__.py b/vdf/__init__.py
@@ -46,10 +46,10 @@ def parse(fp, mapper=dict):
  stack = [mapper()]
  expect_bracket = False
 
- re_keyvalue = re.compile(r'^("(?P<qkey>(?:\\.|[^\\"])+)"|(?P<key>[a-z0-9\-\_]+))'
+ re_keyvalue = re.compile(r'^("(?P<qkey>(?:\\.|[^\\"])+)"|(?P<key>#?[a-z0-9\-\_]+))'
  r'([ \t]*('
  r'"(?P<qval>(?:\\.|[^\\"])*)(?P<vq_end>")?'
- r'|(?P<val>[a-z0-9\-\_]+)'
+ r'|(?P<val>[a-z0-9\-\_\*\.]+)'
  r'))?',
  flags=re.I)