DataComparerLibrary 0.835__tar.gz → 0.838__tar.gz

{DataComparerLibrary-0.835 → DataComparerLibrary-0.838}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DataComparerLibrary
-Version: 0.835
+Version: 0.838
 Summary: For comparing csv-files or 2d-array with csv-file.
 Home-page: 
 Author: René Philip Zuijderduijn

{DataComparerLibrary-0.835 → DataComparerLibrary-0.838}/src/DataComparerLibrary/datacomparer.py

@@ -221,20 +221,20 @@ class DataComparer:
                                         difference_found = True
                                         DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "Date template format displayed. See also next message line.")
                                         DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data, "There is a difference between actual and expected data.")
-                                        continue
+                                continue
                                 #
                             if "{NOT(" in expected_data_including_templates[row_nr][column_nr].upper():
-                                unwanted_expected_data = DataComparer.__get_unwanted_expected_data(self, expected_data_including_date_template)
-                                #
-                                if unwanted_expected_data == -1:
-                                    difference_found = True
-                                    DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "NOT() has been found in expected data field, but format is incorrect.")
-                                else:
+                                try:
+                                    unwanted_expected_data = DataComparer.__get_unwanted_expected_data(self, expected_data_including_date_template)
+                                    #
                                     if fnmatch.fnmatch(actual_data[row_nr][column_nr], unwanted_expected_data):
                                         # Unwanted match.
                                         difference_found = True
                                         DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "NOT() template format displayed. See also next message line.")
                                         DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], unwanted_expected_data, "Actual and expected data are equal. However actual data should NOT be equal to the expected data!!!")
+                                except:
+                                    difference_found = True
+                                    DataComparer.__print_comparation_result(self, row_nr, column_nr, actual_data[row_nr][column_nr], expected_data_including_templates[row_nr][column_nr], "NOT() has been found in expected data field, but format is incorrect.")
                                 #
                             else:
                                 if not skip_exception_rule_used:
@@ -371,17 +371,18 @@ class DataComparer:
 
 
     def __get_unwanted_expected_data(self, expected_data_field_including_date_template):
-        position_open_brace_not_text = expected_data_field_including_date_template.find("{NOT(")
-        position_close_brace_not_text = expected_data_field_including_date_template.find(")}", position_open_brace_not_text)
+        position_open_brace = expected_data_field_including_date_template.find("{NOT(")
+        position_close_brace = expected_data_field_including_date_template.find(")}", position_open_brace)
         #
-        if position_open_brace_not_text == -1:
-            #print("position_open_brace_not_text:", position_open_brace_not_text)
-            return -1
+        if position_open_brace == -1:
+            #print("position_open_brace:", position_open_brace)
+            raise Exception()
         #
-        if position_close_brace_not_text == -1:
-            #print("position_close_brace_not_text:", position_close_brace_not_text)
-            return -1
+        if position_close_brace == -1:
+            #print("position_close_brace:", position_close_brace)
+            raise Exception()
         #
-        unwanted_expected_data = expected_data_field_including_date_template[position_open_brace_not_text+5:position_close_brace_not_text]
+        unwanted_expected_data = expected_data_field_including_date_template[position_open_brace+5:position_close_brace]
         return unwanted_expected_data
 
+

{DataComparerLibrary-0.835 → DataComparerLibrary-0.838}/src/DataComparerLibrary/version.py

@@ -1,3 +1,3 @@
 # encoding=utf-8
 
-VERSION = '0.835'
+VERSION = '0.838'

{DataComparerLibrary-0.835 → DataComparerLibrary-0.838}/src/DataComparerLibrary.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: DataComparerLibrary
-Version: 0.835
+Version: 0.838
 Summary: For comparing csv-files or 2d-array with csv-file.
 Home-page: 
 Author: René Philip Zuijderduijn