update changes.rst; work around another FITS_rec bug

desihub · Sep 2, 2016 · d91b51f · d91b51f
1 parent 3981253
commit d91b51f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/doc/changes.rst b/doc/changes.rst
@@ -2,10 +2,11 @@
 Change Log
 ==========
 
-1.7.1 (unreleased)
+1.8.0 (unreleased)
 ------------------
 
-* No changes yet
+* Added :func:`~desiutil.io.encode_table` and :func:`~desiutil.io.decode_table`
+  for converting string columns in tables between unicode and bytes (PR #41).
 
 1.7.0 (2016-08-18)
 ------------------

diff --git a/py/desiutil/io.py b/py/desiutil/io.py
@@ -164,7 +164,12 @@ def encode_table(data, encoding='ascii'):
     '''
     from astropy.table import Table
     import numpy as np
-    table = Table(data, copy=False)
+
+    try:
+        table = Table(data, copy=False)
+    except ValueError:  #- https://github.com/astropy/astropy/issues/5298
+        table = Table(data, copy=True)
+
     encoding = _pick_encoding(table, encoding)
 
     for col in table.colnames:
@@ -194,7 +199,10 @@ def decode_table(data, encoding='ascii', native=True):
     '''
     from astropy.table import Table
     import numpy as np
-    table = Table(data, copy=False)
+    try:
+        table = Table(data, copy=False)
+    except ValueError:  #- https://github.com/astropy/astropy/issues/5298
+        table = Table(data, copy=True)
 
     #- Check if native str type is bytes
     if native and np.str_('a').dtype.kind == 'S':