diff --git a/wx/lib/agw/rulerctrl.py b/wx/lib/agw/rulerctrl.py index eaf27dd4..baad2bc8 100644 --- a/wx/lib/agw/rulerctrl.py +++ b/wx/lib/agw/rulerctrl.py @@ -257,7 +257,7 @@ def ConvertWXToPIL(bmp): width = bmp.GetWidth() height = bmp.GetHeight() - img = Image.fromstring("RGBA", (width, height), bmp.GetData()) + img = Image.frombytes("RGBA", (width, height), bmp.GetData()) return img @@ -276,12 +276,12 @@ def ConvertPILToWX(pil, alpha=True): if alpha: image = wx.Image(*pil.size) - image.SetData(pil.convert("RGB").tostring()) - image.SetAlpha(pil.convert("RGBA").tostring()[3::4]) + image.SetData(pil.convert("RGB").tobytes()) + image.SetAlpha(pil.convert("RGBA").tobytes()[3::4]) else: image = wx.Image(pil.size[0], pil.size[1]) new_image = pil.convert('RGB') - data = new_image.tostring() + data = new_image.tobytes() image.SetData(data) return image diff --git a/wx/lib/agw/shapedbutton.py b/wx/lib/agw/shapedbutton.py index 18a4a5aa..fcce5296 100644 --- a/wx/lib/agw/shapedbutton.py +++ b/wx/lib/agw/shapedbutton.py @@ -909,7 +909,7 @@ class SButton(wx.Window): width = bmp.GetWidth() height = bmp.GetHeight() - img = Image.fromstring("RGBA", (width, height), bmp.GetData()) + img = Image.frombytes("RGBA", (width, height), bmp.GetData()) return img @@ -925,12 +925,12 @@ class SButton(wx.Window): if alpha: image = wx.Image(*pil.size) - image.SetData(pil.convert("RGB").tostring()) - image.SetAlpha(pil.convert("RGBA").tostring()[3::4]) + image.SetData(pil.convert("RGB").tobytes()) + image.SetAlpha(pil.convert("RGBA").tobytes()[3::4]) else: image = wx.Image(pil.size[0], pil.size[1]) new_image = pil.convert('RGB') - data = new_image.tostring() + data = new_image.tobytes() image.SetData(data) return image diff --git a/wx/lib/agw/thumbnailctrl.py b/wx/lib/agw/thumbnailctrl.py index 227ac517..d0511803 100644 --- a/wx/lib/agw/thumbnailctrl.py +++ b/wx/lib/agw/thumbnailctrl.py @@ -506,7 +506,7 @@ class PILImageHandler(object): import PIL.ImageEnhance as ImageEnhance pil = Image.new('RGB', (img.GetWidth(), img.GetHeight())) - pil.fromstring(img.GetData()) + pil.frombytes(img.GetData()) enh = ImageEnhance.Brightness(pil) enh = enh.enhance(1.5) img.SetData(enh.convert('RGB').tobytes())