Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/utils/batching.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/utils/batching.py (modified) (4 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/utils/batching.py

@@ -304 +304 @@
         finished_writer = csv.DictWriter(open(finished_path, 'wb'),
                                          finished_headers)
-        os.chmod(finished_path, 0664)
         finished_writer.writerow(dict([(x,x) for x in finished_headers]))
 
@@ -399 +398 @@
                 os.path.abspath(finished_path), failed_path)
 
-    def get_csv_skeleton(self):
-        """Export CSV file only with a header of available fields.
-
-        A raw string with CSV data should be returned.
-        """
-        outfile = StringIO()
-        writer = csv.DictWriter(outfile, self.available_fields)
-        writer.writerow(dict(zip(self.available_fields, self.available_fields))) # header
-        outfile.seek(0)
-        return outfile.read()
-
 class ExporterBase(object):
     """A base for exporters.
@@ -518 +506 @@
 
     The resulting CSV file will be stored in a new temporary directory
-    (using :func:`tempfile.mkdtemp`). It will be named after the
-    exporter used with `.csv` filename extension.
+    (using :func:`tempfile.mkdtemp`).
 
     Returns the path to the created CSV file.
@@ -529 +516 @@
     exporter = getUtility(ICSVExporter, name=exporter_name)
     output_dir = tempfile.mkdtemp()
-    filename = '%s.csv' % exporter_name
-    output_path = os.path.join(output_dir, filename)
+    output_path = os.path.join(output_dir, 'export.csv')
     exporter.export_all(site, filepath=output_path)
     return output_path