Skip to content

Commit 4e86ae5

Browse files
author
Richard Jones
committed
"fix" roundup-admin "import" to not use "universal newline support"...
...since the csv module appears to have its own ideas about such things [SF#1163890]
1 parent 07b0917 commit 4e86ae5

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

CHANGES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ Fixed:
2323
- fix setgid typo (sf bug 1171346)
2424
- fix faulty find_template filename facility (sf bug 1163629)
2525
- fix roundup-admin "export" so it creates the target dir if needed
26+
- "fix" roundup-admin "import" to not use "universal newline support" since
27+
the csv module appears to have its own ideas about such things (sf bug
28+
1163890)
2629

2730

2831
2005-03-03 0.8.2

roundup/admin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1717
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1818
#
19-
# $Id: admin.py,v 1.85.2.4 2005-04-13 06:57:09 richard Exp $
19+
# $Id: admin.py,v 1.85.2.5 2005-04-13 07:00:21 richard Exp $
2020

2121
'''Administration commands for maintaining Roundup trackers.
2222
'''
@@ -1123,7 +1123,7 @@ class colon_separated(csv.excel):
11231123
cl = self.get_class(classname)
11241124

11251125
# ensure that the properties and the CSV file headings match
1126-
f = open(os.path.join(dir, file), 'rU')
1126+
f = open(os.path.join(dir, file), 'r')
11271127
reader = csv.reader(f, colon_separated)
11281128
file_props = None
11291129
maxid = 1

0 commit comments

Comments
 (0)