DataComparerLibrary 0.846__tar.gz → 0.847__tar.gz

{datacomparerlibrary-0.846 → datacomparerlibrary-0.847}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DataComparerLibrary
-Version: 0.846
+Version: 0.847
 Summary: For comparing csv-files, 2d-array with a csv-file or 2d-arrays. For comparing text-files, text variable with a text-file or text variables. Including a sorting module.
 Home-page: 
 Author: René Philip Zuijderduijn

{datacomparerlibrary-0.846 → datacomparerlibrary-0.847}/src/DataComparerLibrary/field.py

@@ -20,6 +20,9 @@ class Field:
         expected_data_with_wildcard = None
         skip_exception_rule_used = False
 
+        if self.field_data == other_field_including_templates_and_literals.field_data:
+            return True
+
         # Replace literal templates with fixed external strings.
         other_field_data_including_templates = self.__replace_template_literals_dict(other_field_including_templates_and_literals.field_data, template_literals_dict)
 
@@ -30,6 +33,11 @@ class Field:
         if Field.__is_same_value_but_different_types(self, other_field_data_including_templates):
             return False
 
+        if isinstance(other_field_data_including_templates, int):
+            # A real integer.
+            Report.show_differences_comparation_result(self.row_nr, self.column_nr, self.field_data, other_field_data_including_templates, "There is a difference between actual and expected data. No match with literals or templates.")
+            return False
+
         # If data in actual and expected field doesn't match, check if a template has been used in expected data.
         match other_field_data_including_templates.upper():
             case "{PRESENT}":

{datacomparerlibrary-0.846 → datacomparerlibrary-0.847}/src/DataComparerLibrary/fileconverter.py

@@ -2,12 +2,16 @@
 # The files are open in binary mode.
 # Currently, methods are implemented to remove or replace a separate linefeed within a record. Records are ended by carriage return linefeed.
 #
+import csv
+import openpyxl
 import os
 import re
+import warnings
 
 
 class FileConverter:
-    def remove_separate_lf(self, input_file, output_file):
+    @staticmethod
+    def remove_separate_lf(input_file, output_file):
         # Remove separate linefeed (LF), so carriage return linefeed (CRLF) remains.
         try:
             if not os.path.exists(input_file):
@@ -24,7 +28,8 @@ class FileConverter:
             raise Exception("Error message: ", type(error).__name__, "–", error)
 
 
-    def replace_separate_lf(self, input_file, output_file, replacement_string, encoding_replacement_string='utf-8'):
+    @staticmethod
+    def replace_separate_lf(input_file, output_file, replacement_string, encoding_replacement_string='utf-8'):
         # Replace separate linefeed (LF), so carriage return linefeed (CRLF) remains.
         try:
             if not os.path.exists(input_file):
@@ -43,7 +48,8 @@ class FileConverter:
             raise Exception("Error message: ", type(error).__name__, "–", error)
 
 
-    def remove_cr_and_lf(self, input):
+    @staticmethod
+    def remove_cr_and_lf(input):
         # Remove carriage return (CR) and linefeed (LF) from input string.
         print("input: ", input)
         output = str(input).replace("\r", "").replace("\n", "")
@@ -52,10 +58,36 @@ class FileConverter:
         return output
 
 
-    def replace_cr_and_lf(self, input, replacement_string):
+    @staticmethod
+    def replace_cr_and_lf(input, replacement_string):
         # Replace carriage return (CR) and linefeed (LF) from input string.
         print("input: ", input)
         output = str(input).replace("\r", replacement_string).replace("\n", replacement_string)
         print("output: ", output)
         #
         return output
+
+
+    @staticmethod
+    def convert_excel_file_to_csv_file(excel_file, csv_file):
+        if not os.path.exists(excel_file):
+            raise Exception("Input file doesn't exists: ", excel_file)
+
+        if not excel_file.endswith('.xslx') and not excel_file.endswith('.xslm') and not excel_file.endswith('.xls') and not excel_file.endswith('.xlm'):
+            raise Exception("Input file is not a Excel-file: ", excel_file)
+
+        if not excel_file.endswith('.csv'):
+            raise Exception("Input file is not a csv-file: ", csv_file)
+
+        with warnings.catch_warnings():
+             warnings.filterwarnings("ignore", message="Workbook contains no defaultstyle", category=UserWarning)
+             #
+             excel = openpyxl.load_workbook(excel_file)
+             # select the active sheet
+             sheet = excel.active
+             #
+             # write the data in a csv-file
+             col = csv.writer(open(csv_file, 'w', newline=""))
+             #
+             for row in sheet.rows:
+                col.writerow([cell.value for cell in row])

datacomparerlibrary-0.847/src/DataComparerLibrary/version.py

@@ -0,0 +1,3 @@
+# encoding=utf-8
+
+VERSION = '0.847'

{datacomparerlibrary-0.846 → datacomparerlibrary-0.847}/src/DataComparerLibrary.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DataComparerLibrary
-Version: 0.846
+Version: 0.847
 Summary: For comparing csv-files, 2d-array with a csv-file or 2d-arrays. For comparing text-files, text variable with a text-file or text variables. Including a sorting module.
 Home-page: 
 Author: René Philip Zuijderduijn

datacomparerlibrary-0.846/src/DataComparerLibrary/version.py

@@ -1,3 +0,0 @@
-# encoding=utf-8
-
-VERSION = '0.846'