Changeset 16818 for main/waeup.kofa/trunk/src/waeup

Timestamp:

21 Feb 2022, 06:21:10 (3 years ago)

Author:

Henrik Bettermann

Message:

Don't complain but remove leading and trailing whitespaces while converting values during import.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/pages.py (modified) (1 diff)
• browser/tests/test_browser.py (modified) (1 diff)
• utils/converters.py (modified) (1 diff)
• utils/helpers.py (modified) (2 diffs)
• utils/tests/test_converters.py (modified) (3 diffs)
• utils/tests/test_helpers.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -1510 +1510 @@
             invalid_line = check_csv_charset(filecontent.splitlines())
             if invalid_line:
-                if invalid_line == -1:
-                    self.flash(_(
-                        "The data in your file contain trailing whitespaces. "
-                        "Please replace."), type='danger')
-                else:
-                    self.flash(_(
-                        "Your file contains forbidden characters or "
-                        "has invalid CSV format. "
-                        "First problematic line detected: line %s. "
-                        "Please replace." % invalid_line), type='danger')
+                self.flash(_(
+                    "Your file contains forbidden characters or "
+                    "has invalid CSV format. "
+                    "First problematic line detected: line %s. "
+                    "Please replace." % invalid_line), type='danger')
                 logger.info('%s - invalid file uploaded: %s' %
                             (ob_class, target))

main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py

@@ -204 +204 @@
         return
 
-    def test_forbidden_file_upload_2(self):
+    def deprecated_test_forbidden_file_upload_2(self):
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.datacenter_path)

main/waeup.kofa/trunk/src/waeup/kofa/utils/converters.py

@@ -280 +280 @@
         new_data = dict()
         for key, val in data_dict.items():
+            val = val.strip()
             field = form_fields.get(key, None)
             if field is not None:

main/waeup.kofa/trunk/src/waeup/kofa/utils/helpers.py

@@ -770 +770 @@
     Returns line num of first illegal char or ``None``. Line nums
     start counting with 1 (not zero). Returns -1 if data contain
-    trailing whitespaces.
+    trailing whitespaces (deactivated).
     """
     linenum = 1
@@ -777 +777 @@
         for row in reader:
             linenum += 1
-            for value in row.values():
-                if value.endswith(' '):
-                    return -1
+            #for value in row.values():
+            #    if value.endswith(' '):
+            #        return -1
     except UnicodeDecodeError:
         return linenum

main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_converters.py

@@ -200 +200 @@
         contact = Contact()
         contact.age = 33
-        input_data = dict(name='Rudi', age='99')
+        input_data = dict(name='  Rudi    ', age=' 99 ')
         converter = IObjectConverter(IContact)  # a converter to IContact
         err, inv_err, data = converter.fromStringDict(
@@ -283 +283 @@
     def test_textline(self):
         contact = Contact()
-        input_data = dict(name='Rudi')
+        input_data = dict(name=' Rudi     ')
         converter = IObjectConverter(IContact)  # a converter to IContact
         err, inv_err, data = converter.fromStringDict(
@@ -357 +357 @@
         # pass string ``contact`` instead of a real object
         err, inv_err, data = converter.fromStringDict(
-            dict(name='Gabi', age='23'), 'contact')
+            dict(name='  Gabi  ', age='23  '), 'contact')
         self.assertEqual(data['age'], 23)
         self.assertEqual(data['name'], u'Gabi')

main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_helpers.py

@@ -545 +545 @@
             "FAC3,Fäcülty 3,school\n"
             ).splitlines()
-        self.assertEqual(helpers.check_csv_charset(csv), -1)
+        self.assertEqual(helpers.check_csv_charset(csv), None)
 
 class MemInfoTestCase(unittest.TestCase):