Rebase on master (#254)

Remove trailing whitespace
Workaround,otherwise KeyError is raised before assertRaises checks if Error is raised
Check each error individual
Fix wrong Error
Add indented and commented test spec
Add test for multiple indent formats
Add support for indented DB layout specifications
Fix for #133
Remove asserts from non tests (#250)

* Replace assert statements with if/else statements
Fix for #215

* Change ValueErrors to better type TypeErrors

* Fix wrong isinstance request back to "not in" check
Fix tests to await correct Error

* Fix wrong Error types
Replace "is False" with a better "not" statement

* Fix wrong errortype

* Use Snap7Exception to use unified error messages

* Fix expected exception to Snap7Exception to be consistent.

* Replace TypeError with Snap7Exception to seperate python- and snap7 type errors

* Replace Snap7Exceptions with better ValueError

* Change Snap7Exception with excepted ValueError

* Remove unuesed imports
replace Snap7Exception with ValueError

Author: Fabian Beitler

snap7/util.py

@@ -403,7 +403,7 @@ def parse_specification(db_specification: str) -> OrderedDict:
     parsed_db_specification = OrderedDict()
 
     for line in db_specification.split('\n'):
-        if line and not (line.isspace() or line[0] == '#'):
+        if line and not line.lstrip().startswith('#'):
             index, var_name, _type = line.split('#')[0].split()
             parsed_db_specification[var_name] = (index, _type)
 

test/test_util.py

@@ -27,6 +27,31 @@
 44      testsint0       SINT
 """
 
+test_spec_indented = """
+
+    4	    ID	         INT
+    6	    NAME	 STRING[4]
+
+ 12.0	testbool1    BOOL
+       12.1	testbool2    BOOL
+ 12.2	testbool3    BOOL
+#    12.3	testbool4    BOOL
+ #  12.4	testbool5    BOOL
+      #    12.5	testbool6    BOOL
+    #   12.6	testbool7    BOOL
+            12.7	testbool8    BOOL
+        13      testReal     REAL
+  17      testDword    DWORD
+    21      testint2     INT
+            23      testDint     DINT
+27      testWord     WORD
+    29      tests5time   S5TIME
+31      testdateandtime DATE_AND_TIME
+        43      testusint0      USINT
+44      testsint0       SINT
+"""
+
+
 _bytearray = bytearray([
     0, 0,  # test int
     4, 4, ord('t'), ord('e'), ord('s'), ord('t'),  # test string
@@ -252,6 +277,30 @@ def test_export(self):
         self.assertIn('testbool1', data)
         self.assertEqual(data['testbool5'], 0)
 
+    def test_indented_layout(self):
+        test_array = bytearray(_bytearray)
+        row = util.DB_Row(test_array, test_spec_indented, layout_offset=4)
+        x = row['ID']
+        y_single_space = row['testbool1']
+        y_multi_space = row['testbool2']
+        y_single_indent = row['testint2']
+        y_multi_indent = row['testbool8']
+
+        with self.assertRaises(KeyError):
+            fail_single_space = row['testbool4']
+        with self.assertRaises(KeyError):
+            fail_multiple_spaces = row['testbool5']
+        with self.assertRaises(KeyError):
+            fail_single_indent = row['testbool6']
+        with self.assertRaises(KeyError):
+            fail_multiple_indent = row['testbool7']
+
+        self.assertEqual(x, 0)
+        self.assertEqual(y_single_space, True)
+        self.assertEqual(y_multi_space, True)
+        self.assertEqual(y_single_indent, 0)
+        self.assertEqual(y_multi_indent, 0)
+
 
 def print_row(data):
     """print a single db row in chr and str