merge from maint-0-8

Author: Richard Jones

CHANGES.txt

@@ -28,6 +28,9 @@ Fixed:
 - fix setgid typo (sf bug 1171346)
 - fix faulty find_template filename facility (sf bug 1163629)
 - fix roundup-admin "export" so it creates the target dir if needed
+- "fix" roundup-admin "import" to not use "universal newline support" since
+  the csv module appears to have its own ideas about such things (sf bug
+  1163890)
 
 
 2005-03-03 0.8.2

roundup/admin.py

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: admin.py,v 1.90 2005-04-13 06:55:44 richard Exp $
+# $Id: admin.py,v 1.91 2005-04-13 07:01:05 richard Exp $
 
 '''Administration commands for maintaining Roundup trackers.
 '''
@@ -1126,7 +1126,7 @@ class colon_separated(csv.excel):
             cl = self.get_class(classname)
 
             # ensure that the properties and the CSV file headings match
-            f = open(os.path.join(dir, file), 'rU')
+            f = open(os.path.join(dir, file), 'r')
             reader = csv.reader(f, colon_separated)
             file_props = None
             maxid = 1