Merge pull request #16 from makeclean/windows_line_endings

This fixes and adds tests for the functionality for reading windows files

Author: makeclean

python/Input.py

@@ -38,14 +38,16 @@ def find_cell(self, cell_id):
                 return cell
         return None
 
-
+    # read the whole file into a big list for further
+    # procesing
     def read(self):
-        with open(self.filename, 'r', errors="replace") as f:
+        with open(self.filename, 'rU', errors="replace") as f:
             self.file_lines = f.readlines()
 
         # sometimes truely monstrous people stuff weird
         # characters into textfiles
         self.file_lines = [x.lower() for x in self.file_lines]
+
         self.total_num_lines = len(self.file_lines)
 
     # access a surface with a particular id

python/test/integration/TestWindowsLineEndings.py

@@ -0,0 +1,15 @@
+#!/usr/env/python
+
+import unittest
+import subprocess
+
+class TestWindowsLineEndings(unittest.TestCase):   
+    def test_windows_line_endings(self):
+        return_code = subprocess.call("python3 ../../csg2csg.py -f files/spheres.i -o all", shell=True)  
+        self.assertEqual(return_code,0)
+        return_code = subprocess.call("sed -e 's/$/\r/' files/spheres.i > spheres_win.i                # UNIX to DOS  (adding CRs)", shell=True)
+        return_code = subprocess.call("python3 ../../csg2csg.py -f spheres_win.i -o all", shell=True)  
+        self.assertEqual(return_code,0)
+
+if __name__ == '__main__':
+    unittest.main()

python/test/integration/files/spheres.i

@@ -0,0 +1,12 @@
+test problem for csg2csg
+1   0   -1   imp:n=1
+2   0   -2 1 imp:n=1
+3   0   -3 2 imp:n=1
+4   0    3   imp:n=0
+
+1 so  10
+2 so  20
+3 so  30
+
+print
+nps 1e6

python/test/integration/run_tests

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -ex
+
+for i in `ls *.py` ; do
+    python3 $i
+done

python/test/run_tests

@@ -4,3 +4,7 @@ set -ex
 for i in `ls *.py` ; do
     python3 $i
 done
+
+cd integration
+./run_tests
+cd ..