Merge pull request #5 from mpewsey/empty-table-fix

Add fix for empty table

Author: mpewsey

plsxml/data/galloping_empty.xml

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='windows-1252' standalone='yes'?>
+
+<root>
+<creator application='PLS-CADD' version='' registereduser='' date='' time='' computer='' user='' project='' projectpath='' activeline='' coordinatesystem='' zone='' zonedsescription='' gridshift='' surveyfoot='' schemafile='' plsxmlver='1.0'/>
+<table plsname='Galloping Summary' tagname='galloping_summary' ncols='5' nrows='0' units='0' version='1' titledetail=''>
+</table>
+</root>

plsxml/data/loader.py

@@ -15,6 +15,10 @@
     galloping_zip=dict(
         file='galloping.zip',
         tables=None
+    ),
+    galloping_empty=dict(
+        file='galloping_empty.xml',
+        tables=None
     )
 )
 

plsxml/plsxml.py

@@ -99,7 +99,7 @@ def is_xml(p):
 
         _print = self._print_func()
         valid_ext = {'.xml'} # Valid extensions
-        excl_ext = re.compile('__MACOSX|\.') # Excluded regex expressions
+        excl_ext = re.compile(r'__MACOSX|\.') # Excluded regex expressions
 
         if tables is not None:
             if isinstance(tables, str):
@@ -213,7 +213,8 @@ def convert_type(data):
             else:
                 self[k] = pd.DataFrame.from_dict(d)
                 # Create new dataframe with columns in order.
-                self[k] = self[k][list(d[0])].copy()
+                if d:
+                    self[k] = self[k][list(d[0])].copy()
 
     def table_summary(self):
         """

plsxml/plsxml_test.py

@@ -54,3 +54,9 @@ def test_verbose():
 def test_load_data():
     for x in data_names():
         xml = load_data(x)
+
+
+def test_empty_table():
+    path = data_path('galloping_empty')
+    xml = PLSXML(path, verbose=True)
+    assert len(xml.keys()) == 1

pytest.ini

@@ -1,3 +1,3 @@
 [pytest]
-DJANGO_SETTINGS_MODULE = settings
+# DJANGO_SETTINGS_MODULE = settings
 python_files = tests.py test_*.py *_test.py