Skip to content

Restore fromstring & tostring aliases in 3.x #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aclark4life merged 1 commit into from
Mar 7, 2013
Merged

Restore fromstring & tostring aliases in 3.x #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions PIL/Image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,15 +538,14 @@ def tobytes(self, encoder_name="raw", *args):

return b"".join(data)

if bytes is str:
# Declare tostring as alias to tobytes
def tostring(self, *args, **kw):
warnings.warn(
'tostring() is deprecated. Please call tobytes() instead.',
DeprecationWarning,
stacklevel=2,
)
return self.tobytes(*args, **kw)
# Declare tostring as alias to tobytes
def tostring(self, *args, **kw):
warnings.warn(
'tostring() is deprecated. Please call tobytes() instead.',
DeprecationWarning,
stacklevel=2,
)
return self.tobytes(*args, **kw)

##
# Returns the image converted to an X11 bitmap. This method
Expand Down Expand Up @@ -595,11 +594,10 @@ def frombytes(self, data, decoder_name="raw", *args):
if s[1] != 0:
raise ValueError("cannot decode image data")

if bytes is str:
# Declare fromstring as alias to frombytes
def fromstring(self, *args, **kw):
warnings.warn('fromstring() is deprecated. Please call frombytes() instead.', DeprecationWarning)
return self.frombytes(*args, **kw)
def fromstring(self, *args, **kw):
""" Deprecated alias to frombytes """
warnings.warn('fromstring() is deprecated. Please call frombytes() instead.', DeprecationWarning)
return self.frombytes(*args, **kw)

##
# Allocates storage for the image and loads the pixel data. In
Expand Down Expand Up @@ -1814,15 +1812,14 @@ def frombytes(mode, size, data, decoder_name="raw", *args):
im.frombytes(data, decoder_name, args)
return im

if bytes is str:
# Declare fromstring as an alias for frombytes
def fromstring(*args, **kw):
warnings.warn(
'fromstring() is deprecated. Please call frombytes() instead.',
DeprecationWarning,
stacklevel=2
)
return frombytes(*args, **kw)
def fromstring(*args, **kw):
" Deprecated alias to frombytes "
warnings.warn(
'fromstring() is deprecated. Please call frombytes() instead.',
DeprecationWarning,
stacklevel=2
)
return frombytes(*args, **kw)

##
# (New in 1.1.4) Creates an image memory referencing pixel data in a
Expand Down
5 changes: 2 additions & 3 deletions PIL/ImagePalette.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ def tobytes(self):
return self.palette
return array.array("B", self.palette).tostring()

if bytes is str:
# Declare tostring as an alias for tobytes
tostring = tobytes
# Declare tostring as an alias for tobytes
tostring = tobytes

def getcolor(self, color):
# experimental: given an rgb tuple, allocate palette entry
Expand Down
22 changes: 19 additions & 3 deletions PIL/ImageWin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
# See the README file for information on usage and redistribution.
#

import warnings
from . import Image

##
Expand Down Expand Up @@ -167,9 +168,24 @@ def frombytes(self, buffer):
def tobytes(self):
return self.image.tobytes()

if bytes is str:
tostring = tobytes
fromstring = frombytes
##
# Deprecated aliases to frombytes & tobytes.

def fromstring(self, *args, **kw):
warnings.warn(
'fromstring() is deprecated. Please call frombytes() instead.',
DeprecationWarning,
stacklevel=2
)
return self.frombytes(*args, **kw)

def tostring(self):
warnings.warn(
'tostring() is deprecated. Please call tobytes() instead.',
DeprecationWarning,
stacklevel=2
)
return self.tobytes()

##
# Create a Window with the given title size.
Expand Down
2 changes: 0 additions & 2 deletions _imagingcms.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,7 @@ static PyMethodDef pyCMSdll_methods[] = {

{"profile_open", cms_profile_open, 1},
{"profile_frombytes", cms_profile_fromstring, 1},
#if PY_VERSION_HEX < 0x03000000
{"profile_fromstring", cms_profile_fromstring, 1},
#endif

/* profile and transform functions */
{"buildTransform", buildTransform, 1},
Expand Down
2 changes: 0 additions & 2 deletions display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,8 @@ static struct PyMethodDef methods[] = {
{"releasedc", (PyCFunction)_releasedc, 1},
{"frombytes", (PyCFunction)_frombytes, 1},
{"tobytes", (PyCFunction)_tobytes, 1},
#if PY_VERSION_HEX < 0x03000000
{"fromstring", (PyCFunction)_frombytes, 1},
{"tostring", (PyCFunction)_tobytes, 1},
#endif
{NULL, NULL} /* sentinel */
};

Expand Down