Changeset 9846

Timestamp:

9 Jan 2013, 06:23:49 (12 years ago)

Author:

Henrik Bettermann

Message:

Transform level and session values into integers.

Location:

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

Files:

• catalog.py (modified) (1 diff)
• students/tests/test_export.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/catalog.py

@@ -124 +124 @@
             if idx_name == 'catalog':
                 continue
+            if isinstance(value, str) and ('session' in idx_name
+                or 'level' in idx_name):
+                value = int(value)
             if not isinstance(value, tuple):
                 value = (value, value)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

@@ -202 +202 @@
             current_session=2012, current_level=None)
         result2 = open(self.outfile, 'rb').read()
+        # current_level can be both a string ...
         exporter.export_filtered(
             self.app, self.outfile,
-            current_session=None, current_level=200)
+            current_session=None, current_level='200')
         result3 = open(self.outfile, 'rb').read()
         exporter.export_filtered(
@@ -210 +211 @@
             current_session=2011, current_level=None)
         result4 = open(self.outfile, 'rb').read()
+        # ... and an integer
         exporter.export_filtered(
             self.app, self.outfile,
@@ -227 +229 @@
         notify(grok.ObjectModifiedEvent(self.student))
         exporter = StudentsExporter()
-
+        # current_session can be both a string ...
         exporter.export_filtered(
             self.app, self.outfile,
-            current_session=2012, current_level=200, depcode='NA')
+            current_session='2012', current_level='200', depcode='NA')
         result1 = open(self.outfile, 'rb').read()
+        # ... and an integer
         exporter.export_filtered(
             self.app, self.outfile,
@@ -249 +252 @@
         exporter.export_filtered(
             self.app, self.outfile,
-            current_session=2012, current_level=200, faccode='NA')
+            current_session=2012, current_level='200', faccode='NA')
         result1 = open(self.outfile, 'rb').read()
         exporter.export_filtered(