python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-16 11:12:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3624 from hugovk/rm-VERSION

Browse Source 
Remove deprecated VERSION
This commit is contained in:
Andrew Murray 2019-03-02 11:47:59 +11:00 committed by GitHub
commit 57807e9ce2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/test_000_sanity.py
View File

@ -11,8 +11,6 @@ class TestSanity(PillowTestCase):
# Make sure we have the binary extension # Make sure we have the binary extension
PIL.Image.core.new("L", (100, 100)) PIL.Image.core.new("L", (100, 100))
self.assertEqual(PIL.Image.VERSION[:3], '1.1')
# Create an image and do stuff with it. # Create an image and do stuff with it.
im = PIL.Image.new("1", (100, 100)) im = PIL.Image.new("1", (100, 100))
self.assertEqual((im.mode, im.size), ('1', (100, 100))) self.assertEqual((im.mode, im.size), ('1', (100, 100)))

9
src/PIL/Image.py
View File

@ -24,10 +24,10 @@
# See the README file for information on usage and redistribution. # See the README file for information on usage and redistribution.
# #
# VERSION is deprecated and will be removed in Pillow 6.0.0. # VERSION was removed in Pillow 6.0.0.
# PILLOW_VERSION is deprecated and will be removed after that. # PILLOW_VERSION is deprecated and will be removed in Pillow 7.0.0.
# Use __version__ instead. # Use __version__ instead.
from . import VERSION, PILLOW_VERSION, __version__, _plugins from . import PILLOW_VERSION, __version__, _plugins
from ._util import py3 from ._util import py3
import logging import logging
@ -60,8 +60,7 @@ except ImportError:
from collections import Callable from collections import Callable
# Silence warnings # Silence warning
assert VERSION
assert PILLOW_VERSION assert PILLOW_VERSION
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

2
src/PIL/ImageCms.py
View File

@ -950,5 +950,5 @@ def versions():
return ( return (
VERSION, core.littlecms_version, VERSION, core.littlecms_version,
sys.version.split()[0], Image.VERSION sys.version.split()[0], Image.__version__
) )

5
src/PIL/__init__.py
View File

@ -16,10 +16,9 @@ PIL.VERSION is the old PIL version and will be removed in the future.
from . import _version from . import _version
# VERSION is deprecated and will be removed in Pillow 6.0.0. # VERSION was removed in Pillow 6.0.0.
# PILLOW_VERSION is deprecated and will be removed after that. # PILLOW_VERSION is deprecated and will be removed in Pillow 7.0.0.
# Use __version__ instead. # Use __version__ instead.
VERSION = '1.1.7' # PIL Version
PILLOW_VERSION = __version__ = _version.__version__ PILLOW_VERSION = __version__ = _version.__version__
del _version del _version