merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -15,6 +15,7 @@ Fixed:
 - fixed external password source example (sf bug 986601)
 - document the STATIC_FILES config var
 - implement the HTTP HEAD command (sf bug 992544)
+- fix journal export of files to remove content from CSV files
 
 
 2004-06-24 0.7.5

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_anydbm.py,v 1.146.2.13 2004-07-01 03:58:34 richard Exp $
+#$Id: back_anydbm.py,v 1.146.2.14 2004-07-20 05:58:47 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -2080,7 +2080,7 @@ def import_journals(self, entries):
         for nodeid, l in d.items():
             self.db.setjournal(self.classname, nodeid, l)
 
-class FileClass(Class, hyperdb.FileClass):
+class FileClass(hyperdb.FileClass, Class):
     '''This class defines a large chunk of data. To support this, it has a
        mandatory String property "content" which is typically saved off
        externally to the hyperdb.

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.70.2.6 2004-07-01 03:58:34 richard Exp $
+# $Id: back_metakit.py,v 1.70.2.7 2004-07-20 05:58:47 richard Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -1814,7 +1814,7 @@ class FileName(hyperdb.String):
     hyperdb.Boolean   : 'I',
     hyperdb.Number    : 'I',
 }
-class FileClass(Class, hyperdb.FileClass):
+class FileClass(hyperdb.FileClass, Class):
     ''' like Class but with a content property
     '''
     default_mime_type = 'text/plain'

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.98.2.17 2004-07-19 00:38:54 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.18 2004-07-20 05:58:47 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2550,7 +2550,7 @@ def import_journals(self, entries):
         for nodeid, l in d.items():
             self.db.setjournal(self.classname, nodeid, l)
 
-class FileClass(Class, hyperdb.FileClass):
+class FileClass(hyperdb.FileClass, Class):
     '''This class defines a large chunk of data. To support this, it has a
        mandatory String property "content" which is typically saved off
        externally to the hyperdb.

roundup/hyperdb.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: hyperdb.py,v 1.97.2.2 2004-06-24 07:14:23 richard Exp $
+# $Id: hyperdb.py,v 1.97.2.3 2004-07-20 05:58:47 richard Exp $
 
 """Hyperdatabase implementation, especially field types.
 """
@@ -771,6 +771,7 @@ def export_propnames(self):
         propnames = self.getprops().keys()
         propnames.remove('content')
         propnames.sort()
+        print propnames
         return propnames
 
     def export_files(self, dirname, nodeid):