From: Scott Kostyshak <skostysh@princeton.edu>
Date: Sun, 16 Feb 2014 05:07:43 +0000 (-0500)
Subject: csv2lyx: use universal newlines when reading CSVs
X-Git-Tag: 2.1.0rc1~212
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=eb53788f3a78d12a31478f0522afdcd644645e84;p=features.git

csv2lyx: use universal newlines when reading CSVs

Patch from Dustin J. Mitchell.
---

diff --git a/lib/scripts/csv2lyx.py b/lib/scripts/csv2lyx.py
index ab194f7cc4..27063235c9 100644
--- a/lib/scripts/csv2lyx.py
+++ b/lib/scripts/csv2lyx.py
@@ -164,21 +164,21 @@ if options.column_sep == 't':
 
 # when no special column separator is given, try to detect it:
 if options.column_sep and dialect :
-    reader = csv.reader(open(infile, "rb"), dialect = dialect, delimiter = options.column_sep)
+    reader = csv.reader(open(infile, "rU"), dialect = dialect, delimiter = options.column_sep)
 else:
     guesser = csv.Sniffer()
-    input_file = "".join(open(infile,'rb').readlines())
+    input_file = "".join(open(infile,'rU').readlines())
     try:
         dialect = guesser.sniff(input_file)
-        reader = csv.reader(open(infile, "rb"), dialect = dialect)
+        reader = csv.reader(open(infile, "rU"), dialect = dialect)
     except:
         # older versions (python < 2.5) of csv have problems (bugs)
         # that is why we try harder to get a result, this should work on most cases
         # as it assumes that the separator is a comma (the c in csv :-) )
         try:
-            reader = csv.reader(open(infile, "rb"), dialect = dialect, delimiter = ',')
+            reader = csv.reader(open(infile, "rU"), dialect = dialect, delimiter = ',')
         except:
-            reader = csv.reader(open(infile, "rb"), delimiter = ',')
+            reader = csv.reader(open(infile, "rU"), delimiter = ',')
 
 # read input
 num_cols = 1 # max columns