Changeset 14939 for main/waeup.kofa/trunk/src/waeup/kofa/utils

Timestamp:

18 Jan 2018, 07:34:42 (7 years ago)

Author:

Henrik Bettermann

Message:

Do not allow uploading data with trailing whitespaces.

Location:

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

Files:

• helpers.py (modified) (3 diffs)
• tests/test_helpers.py (modified) (1 diff)

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

@@ -756 +756 @@
 
 def check_csv_charset(iterable):
-    """Check contents of `iterable` regarding valid CSV encoding.
+    """Check contents of `iterable` regarding valid CSV encoding and
+    trailing whitespaces in data.
 
     `iterable` is expected to be an iterable on _rows_ (not
@@ -764 +765 @@
 
     Returns line num of first illegal char or ``None``. Line nums
-    start counting with 1 (not zero).
+    start counting with 1 (not zero). Returns -1 if data contain
+    trailing whitespaces.
     """
     linenum = 1
@@ -771 +773 @@
         for row in reader:
             linenum += 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_helpers.py

@@ -537 +537 @@
         self.assertEqual(helpers.check_csv_charset(csv), 2)
 
+
+    def test_invalid_data3(self):
+        csv = (
+            "code,title,title_prefix\n"
+            "FAC1,Faculty 1,faculty\n"
+            "FAC2,Faculty 2 ,institute\n"
+            "FAC3,Fäcülty 3,school\n"
+            ).splitlines()
+        self.assertEqual(helpers.check_csv_charset(csv), -1)
 
 class MemInfoTestCase(unittest.TestCase):