Fix bug that caused W5 VO Table to not be read in correctly with rece…

…nt versions of Numpy and Astropy
glue-viz · Dec 20, 2018 · ac1a453 · ac1a453
1 parent 06ad71c
commit ac1a453
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,12 @@ v0.15.0 (unreleased)
 
 * No changes yet.
 
+v0.14.2 (unreleased)
+--------------------
+
+* Fix bug that caused demo VO Table to not be read in correctly with
+  recent versions of Numpy and Astropy. [#1911]
+
 v0.14.1 (unreleased)
 --------------------
 

diff --git a/glue/core/data_factories/astropy_table.py b/glue/core/data_factories/astropy_table.py
@@ -76,7 +76,7 @@ def astropy_tabular_data(*args, **kwargs):
             # fill array for now
             try:
                 c = c.filled(fill_value=np.nan)
-            except ValueError:  # assigning nan to integer dtype
+            except (ValueError, TypeError):  # assigning nan to integer dtype
                 c = c.filled(fill_value=-1)
 
         nc = Component.autotyped(c, units=u)