Match literal backslash in CIF regex, relates #176

Author: benmwebb

ihm/dictionary.py

@@ -288,6 +288,10 @@ def __init__(self, name, primitive_code, construct):
         # Extend this to match any Unicode "word" character so we don't
         # fail to validate as soon as we see an accented character.
         self.construct = construct.replace('A-Za-z0-9', r'\w')
+        # CIF regexes often include '\{}' which is interpreted by Python re
+        # as matching '{' or '}', but it is presumably intended to also
+        # match a literal backslash
+        self.construct = self.construct.replace(r'\{}', r'\\{}')
         self.primitive_code = primitive_code
         # Ensure that regex matches the entire value
         try:

test/test_dictionary.py

@@ -38,7 +38,8 @@ def make_test_dictionary():
     c.mandatory = False
     k = add_keyword("foo", False, c)
     # For testing we only accept upper case values
-    k.item_type = ihm.dictionary.ItemType('text', 'char', r'[ \n\t_()A-Z]+')
+    k.item_type = ihm.dictionary.ItemType('text', 'char',
+                                          r'[ \n\t_()/\{}A-Z]+')
     k = add_keyword("bar", True, c)
     k.enumeration = set(('enum1', 'enum2'))
     add_keyword("baz", False, c)
@@ -389,11 +390,14 @@ def test_validate_item_type_multiline(self):
         d.validate(StringIO(prefix + '"FOO_BAR"'))
         d.validate(StringIO(prefix + '"FOO\tBAR"'))
         d.validate(StringIO(prefix + '\n;FOO\nBAR\n;'))
+        d.validate(StringIO(prefix + '"FOO{BAR"'))
+        d.validate(StringIO(prefix + '"FOO}BAR"'))
+        d.validate(StringIO(prefix + '"FOO\\BAR"'))
         # Bad strings
         self.assertRaises(ihm.dictionary.ValidatorError, d.validate,
                           StringIO(prefix + '"foo BAR"'))
         self.assertRaises(ihm.dictionary.ValidatorError, d.validate,
-                          StringIO(prefix + '"FOO\\BAR"'))
+                          StringIO(prefix + '"foo#BAR"'))
         self.assertRaises(ihm.dictionary.ValidatorError, d.validate,
                           StringIO(prefix + 'n'))
         self.assertRaises(ihm.dictionary.ValidatorError, d.validate,