Fix bytes vs. str bugs due to transition to Py3

peterkuma · peterkuma · commit e1d0cf624b67 · 2021-03-16T13:30:28.000+01:00
diff --git a/bin/ccplot b/bin/ccplot
@@ -1328,7 +1328,7 @@ def plot_profile(what, fname, product, fig, axes, hextent=HorizontalExtent(),
     global ATRAIN_SPEED, PROFILE_BINHEIGHT
 
     info = DATASETS.get(what, {
-        "datasets": [what],
+        "datasets": [what.encode('utf-8')],
     })
     filetype = autodetect(product)
     product_name = None
diff --git a/ccplot/hdf.pyx b/ccplot/hdf.pyx
@@ -444,7 +444,7 @@ class HDF(DictMixin):
                 )
 
             if data_type == DFNT_CHAR:
-                return bytes(bytearray(data)).rstrip('\0')
+                return bytes(bytearray(data)).rstrip(b'\0')
             else:
                 return data.view(dtype=dtype)
 

Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,7 @@ class HDF(DictMixin):`
`444`	`444`	`)`
`445`	`445`
`446`	`446`	`if data_type == DFNT_CHAR:`
`447`		`- return bytes(bytearray(data)).rstrip('\0')`
	`447`	`+ return bytes(bytearray(data)).rstrip(b'\0')`
`448`	`448`	`else:`
`449`	`449`	`return data.view(dtype=dtype)`
`450`	`450`