merge from maint-0-8

Author: Richard Jones

CHANGES.txt

@@ -13,6 +13,8 @@ Feature:
 
 Fixed:
 - added content to ZRoundup refresh.txt file (sf bug 1147622)
+- fix invalid reference to csv.colon_separated
+- correct URL to What's New in setup.py meta-data
 
 
 2005-02-17 0.8.1

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.88 2005-02-16 14:22:16 a1s Exp $
+# $Id: admin.py,v 1.89 2005-02-28 03:14:49 richard Exp $
 
 '''Administration commands for maintaining Roundup trackers.
 '''
@@ -1123,7 +1123,7 @@ class colon_separated(csv.excel):
 
             # ensure that the properties and the CSV file headings match
             f = open(os.path.join(dir, file), 'rU')
-            reader = csv.reader(f, csv.colon_separated)
+            reader = csv.reader(f, colon_separated)
             file_props = None
             maxid = 1
             # loop through the file and create a node for each entry
@@ -1141,7 +1141,7 @@ class colon_separated(csv.excel):
 
             # import the journals
             f = open(os.path.join(args[0], classname + '-journals.csv'), 'rU')
-            reader = csv.reader(f, csv.colon_separated)
+            reader = csv.reader(f, colon_separated)
             cl.import_journals(reader)
             f.close()
 

setup.py

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: setup.py,v 1.79 2005-02-15 23:10:52 richard Exp $
+# $Id: setup.py,v 1.80 2005-02-28 03:14:48 richard Exp $
 
 from distutils.core import setup, Extension
 from distutils.util import get_platform
@@ -326,7 +326,7 @@ def main():
 This release introduces far too many features to list here so I've put
 together a What's New page:
 
-  http://roundup.sourceforge.net/doc-0.7/whatsnew-0.7.html
+  http://roundup.sourceforge.net/doc-0.8/whatsnew-0.8.html
 
 Some highlights: