Fix encoding handling bug for py2

Author: kshedden

pandas/io/sas/sas7bdat.py

@@ -406,7 +406,8 @@ def _process_columntext_subheader(self, offset, length):
         text_block_size = self._read_int(offset, const.text_block_size_length)
 
         buf = self._read_bytes(offset, text_block_size)
-        cname = buf[0:text_block_size].rstrip(b"\x00 ")
+        cname_raw = buf[0:text_block_size].rstrip(b"\x00 ")
+        cname = cname_raw
         if self.convert_header_text:
             cname = cname.decode(self.encoding or self.default_encoding)
         self.column_names_strings.append(cname)
@@ -415,7 +416,7 @@ def _process_columntext_subheader(self, offset, length):
             column_name = self.column_names_strings[0]
             compression_literal = ""
             for cl in const.compression_literals:
-                if cl in str(column_name):
+                if cl in cname_raw:
                     compression_literal = cl
             self.compression = compression_literal
             offset -= self._int_length

pandas/io/sas/sas_constants.py

@@ -91,8 +91,8 @@
 column_label_offset_length = 2
 column_label_length_offset = 32
 column_label_length_length = 2
-rle_compression = 'SASYZCRL'
-rdc_compression = 'SASYZCR2'
+rle_compression = b'SASYZCRL'
+rdc_compression = b'SASYZCR2'
 
 compression_literals = [rle_compression, rdc_compression]
 

pandas/io/tests/sas/test_sas7bdat.py

@@ -97,8 +97,17 @@ def test_productsales():
 def test_12659():
     dirpath = tm.get_data_path()
     fname = os.path.join(dirpath, "test_12659.sas7bdat")
-    df = pd.read_sas(fname, encoding='latin1')
+    df = pd.read_sas(fname)
     fname = os.path.join(dirpath, "test_12659.csv")
     df0 = pd.read_csv(fname)
     df0 = df0.astype(np.float64)
     tm.assert_frame_equal(df, df0)
+
+def test_airline():
+    dirpath = tm.get_data_path()
+    fname = os.path.join(dirpath, "airline.sas7bdat")
+    df = pd.read_sas(fname)
+    fname = os.path.join(dirpath, "airline.csv")
+    df0 = pd.read_csv(fname)
+    df0 = df0.astype(np.float64)
+    tm.assert_frame_equal(df, df0, check_exact=False)