Raise more helpful error when reading a blank file

theavey · Dec 13, 2018 · 4ce75ff · 4ce75ff
1 parent 013432e
commit 4ce75ff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/paratemp/geometries.py b/paratemp/geometries.py
@@ -34,7 +34,6 @@
 __all__ = ['rotation_matrix', 'Vector', 'XYZ', 'COM']
 
 
-
 def rotation_matrix(axis, theta):
     """
     Return the rotation matrix associated with counterclockwise rotation about
@@ -101,9 +100,12 @@ def __init__(self, f_name):
         self.file = f_name
         with open(f_name, 'r') as f_file:
             f_lines = f_file.readlines()
+        if len(f_lines) < 2:
+            raise TypeError('The given file {} appears '
+                            'to be empty'.format(f_name))
         self._header = f_lines[0:2]
         if 'Energy' in self._header[1]:
-            energy_match = re.search('(?:Energy:\s+)(-\d+\.\d+)',
+            energy_match = re.search(r'(?:Energy:\s+)(-\d+\.\d+)',
                                      self._header[1])
             self._energy = float(energy_match.group(1))
         else:

diff --git a/tests/test-data/empty.txt b/tests/test-data/empty.txt
diff --git a/tests/test-data/empty_line.txt b/tests/test-data/empty_line.txt
diff --git a/tests/test_geometries.py b/tests/test_geometries.py
@@ -56,6 +56,10 @@ def test_bad_lines(self):
             XYZ('tests/test-data/stil-3htmf-bad.xyz')
         with pytest.raises(ValueError):
             XYZ('tests/test-data/stil-3htmf-bad-2.xyz')
+        with pytest.raises(TypeError):
+            XYZ('tests/test-data/empty.txt')
+        with pytest.raises(TypeError):
+            XYZ('tests/test-data/empty_line.txt')
 
 
 class TestXYZNewline(object):