Merge pull request #62 from yohanboniface/invalid-definedname

Warn and skip invalid defined-name instead of raising
PydPiper · Nov 23, 2021 · a802d45 · a802d45
2 parents 4bd2d95 + abc7f43
commit a802d45
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/pylightxl/pylightxl.py b/pylightxl/pylightxl.py
@@ -65,6 +65,7 @@
 import os
 import sys
 import shutil
+import warnings
 from xml.etree import cElementTree as ET
 import time
 from datetime import datetime, timedelta
@@ -242,9 +243,11 @@ def readxl_get_workbook(fn):
         try:
             ws, address = fulladdress.split('!')
         except ValueError:
-            raise UserWarning('pylightxl - Ill formatted workbook.xml. '
-                              'NamedRange does not contain sheet reference (ex: "Sheet1!A1"): '
-                              '{name} - {fulladdress}'.format(name=name, fulladdress=fulladdress))
+            msg = ('pylightxl - Ill formatted workbook.xml. '
+                   'Skpping NamedRange not containing sheet reference (ex: "Sheet1!A1"): '
+                   '{name} - {fulladdress}'.format(name=name, fulladdress=fulladdress))
+            warnings.warn(msg, UserWarning)
+            continue
 
         rv['nr'][name] = {'nr': name, 'ws': ws, 'address': address}
 

diff --git a/test/test_readxl.py b/test/test_readxl.py
@@ -53,11 +53,11 @@ def test_bad_readxl_extension(self):
                               'File extension supported: .xlsx .xlsm'.format('csv'), e)
 
     def test_bad_readxl_workbook_format(self):
-        with self.assertRaises(UserWarning) as e:
+        msg = ('pylightxl - Ill formatted workbook.xml. '
+               'Skipping NamedRange not containing sheet reference (ex: "Sheet1!A1"): '
+               '{name} - {fulladdress}'.format(name='single_nr', fulladdress='$E$6'))
+        with self.assertWarns(UserWarning, msg=msg):
             _ = xl.readxl_get_workbook('./bad_nr_workbook.zip')
-            self.assertRaises('pylightxl - Ill formatted workbook.xml. '
-                              'NamedRange does not contain sheet reference (ex: "Sheet1!A1"): '
-                              '{name} - {fulladdress}'.format(name='single_nr', fulladdress='$E$6'), e)
 
 
 class TestReadCSV(TestCase):