Changeset 12178

Timestamp:

8 Dec 2014, 16:55:05 (10 years ago)

Author:

Henrik Bettermann

Message:

Use fantasy field names in base classes to point out that these names will be overridden in derived classes.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/utils

Files:

• batching.py (modified) (3 diffs)
• tests/test_batching.py (modified) (4 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/batching.py

@@ -66 +66 @@
 
     # Headers needed to locate items...
-    location_fields = ['code', 'faculty_code']
+    location_fields = ['any_id']
 
     # A factory with this name must be registered...
@@ -227 +227 @@
                 # Computed attributes can't be set.
                 continue
-            log_value = getattr(value, 'code', value)
+            log_value = getattr(value, 'any_id', value)
             changed.append('%s=%s' % (key, log_value))
 
@@ -418 +418 @@
 
     #: Fieldnames considered by this exporter
-    fields = ('code', 'title', 'title_prefix')
+    fields = ('any_id', 'any_title')
 
     #: The title under which this exporter will be displayed

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/tests/test_batching.py

@@ -289 +289 @@
         exporter = ExporterBase()
         writer, outfile = exporter.get_csv_writer()
-        writer.writerow(dict(code='A', title='B', title_prefix='C'))
+        writer.writerow(dict(any_id='A', any_title='B'))
         outfile.seek(0)
         self.assertEqual(
             outfile.read(),
-            'code,title,title_prefix\r\nA,B,C\r\n')
+            'any_id,any_title\r\nA,B\r\n')
         return
 
@@ -300 +300 @@
         exporter = ExporterBase()
         writer, outfile = exporter.get_csv_writer(filepath=self.workfile)
-        writer.writerow(dict(code='A', title='B', title_prefix='C'))
+        writer.writerow(dict(any_id='A', any_title='B'))
         outfile.close()
         resultfile = open(self.workfile, 'rb')
         self.assertEqual(
             resultfile.read(),
-            'code,title,title_prefix\r\nA,B,C\r\n')
+            'any_id,any_title\r\nA,B\r\n')
         return
 
@@ -313 +313 @@
         writer, outfile = exporter.get_csv_writer()
         class Sample(object):
-            code = 'A'
-            title = u'B'
-            title_prefix = True
+            any_id = 'A'
+            any_title = u'B'
         exporter.write_item(Sample(), writer)
         outfile.seek(0)
         self.assertEqual(
             outfile.read(),
-            'code,title,title_prefix\r\nA,B,1\r\n')
+            'any_id,any_title\r\nA,B\r\n')
         return
 
@@ -328 +327 @@
         writer, outfile = exporter.get_csv_writer()
         result = exporter.close_outfile(None, outfile)
-        self.assertEqual(result, 'code,title,title_prefix\r\n')
+        self.assertEqual(result, 'any_id,any_title\r\n')
         return