Merge pull request #16 from cdsontag/cds_dev

for #11; be more forgiving with bad data (non-ascii)
spacetelescope · Jan 4, 2017 · 67b46f8 · 67b46f8
2 parents f55efe9 + 7b013a5
commit 67b46f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/stsci/tools/capable.py b/lib/stsci/tools/capable.py
@@ -10,7 +10,7 @@
 
 import os, sys
 PY3K = sys.version_info[0] > 2
-descrip = "basic capabilities file, last edited: 28 Nov 2016"
+descrip = "basic capabilities file, last edited: 4 Jan 2017"
 
 def is_darwin_and_x():
     """ Convenience function.  Returns True if is an X11-linked Python/tkinter

diff --git a/lib/stsci/tools/irafutils.py b/lib/stsci/tools/irafutils.py
@@ -472,7 +472,7 @@ def read(self, file, nbytes):
             while nbytes>0:
                 snew = os.read(fd, nbytes) # returns bytes in PY3K
                 if snew:
-                    if PY3K: snew = snew.decode('ascii')
+                    if PY3K: snew = snew.decode('ascii','replace')
                     s.append(snew)
                     nbytes -= len(snew)
                 else:
@@ -499,7 +499,7 @@ def _read(self, fd, mask):
             # it actually requests more data
             if select.select([fd],[],[],0)[0]:
                 snew = os.read(fd, self.nbytes) # returns bytes in PY3K
-                if PY3K: snew = snew.decode('ascii')
+                if PY3K: snew = snew.decode('ascii','replace')
                 self.value.append(snew)
                 self.nbytes -= len(snew)
             else: