relax stringent requirements for string annotation fields

cx1111 · cx1111 · commit a01250bd3e50 · 2017-09-27T11:46:20.000-04:00
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
     # Versions should comply with PEP440. For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.3.3',
+    version='1.3.4',
 
     description='The WFDB Python Toolbox',
     long_description=long_description,
diff --git a/wfdb/readwrite/annotations.py b/wfdb/readwrite/annotations.py
@@ -243,17 +243,18 @@ def checkfield(self, field):
                     if not hasattr(label_store[i], '__index__'):
                         raise TypeError('The label_store values of the '+field+' field must be integer-like')
                 
-                if not isinstance(symbol[i], strtypes) or len(symbol[i]) not in [1,2]:
-                    raise ValueError('The symbol values of the '+field+' field must be strings of length 1 or 2')
+                if not isinstance(symbol[i], strtypes) or len(symbol[i]) not in [1,2,3]:
+                    raise ValueError('The symbol values of the '+field+' field must be strings of length 1 to 3')
 
                 if bool(re.search('[ \t\n\r\f\v]', symbol[i])):
                     raise ValueError('The symbol values of the '+field+' field must not contain whitespace characters')
 
                 if not isinstance(description[i], strtypes):
                     raise TypeError('The description values of the '+field+' field must be strings')
 
-                if bool(re.search('[\t\n\r\f\v]', description[i])):
-                    raise ValueError('The description values of the '+field+' field must not contain tabs or newlines')
+                # Would be good to enfore this but existing garbage annotations have tabs and newlines...
+                #if bool(re.search('[\t\n\r\f\v]', description[i])):
+                #    raise ValueError('The description values of the '+field+' field must not contain tabs or newlines')
 
         # The string fields
         elif field in ['symbol', 'description', 'aux_note']:
@@ -265,8 +266,8 @@ def checkfield(self, field):
             
             if field == 'symbol':
                 for e in uniq_elements:
-                    if len(e) not in [1,2]:
-                        raise ValueError('Subelements of the '+field+' field must be strings of length 1 or 2')
+                    if len(e) not in [1,2,3]:
+                        raise ValueError('Subelements of the '+field+' field must be strings of length 1 to 3')
                     if bool(re.search('[ \t\n\r\f\v]', e)):
                         raise ValueError('Subelements of the '+field+' field may not contain whitespace characters')
             else:
