python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-10 19:56:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove testing of Python-2-only cPickle module

Browse Source 
In Python 3, cPickle and pickle have been merged to a single module.

From https://docs.python.org/3/whatsnew/3.0.html#library-changes

> A common pattern in Python 2.x is to have one version of a module
> implemented in pure Python, with an optional accelerated version
> implemented as a C extension; for example, pickle and cPickle. This
> places the burden of importing the accelerated version and falling
> back on the pure Python version on each user of these modules. In
> Python 3.0, the accelerated versions are considered implementation
> details of the pure Python versions. Users should always import the
> standard version, which attempts to import the accelerated version and
> falls back to the pure Python version. The pickle / cPickle pair
> received this treatment.

Can now move the 'import pickle' to the top of the test file.
This commit is contained in:
Jon Dufresne 2020-02-17 10:23:51 -08:00
parent 53ece804c7
commit 9e856b8a72
1 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Tests/test_pickle.py
View File

@ -1,3 +1,5 @@
import pickle
from PIL import Image from PIL import Image
from .helper import PillowTestCase from .helper import PillowTestCase
@ -35,30 +37,12 @@ class TestPickle(PillowTestCase):
self.assertEqual(im, loaded_im) self.assertEqual(im, loaded_im)
def test_pickle_image(self): def test_pickle_image(self):
# Arrange
import pickle
# Act / Assert # Act / Assert
for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1): for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1):
self.helper_pickle_string(pickle, protocol) self.helper_pickle_string(pickle, protocol)
self.helper_pickle_file(pickle, protocol) self.helper_pickle_file(pickle, protocol)
def test_cpickle_image(self):
# Arrange
try:
import cPickle
except ImportError:
return
# Act / Assert
for protocol in range(0, cPickle.HIGHEST_PROTOCOL + 1):
self.helper_pickle_string(cPickle, protocol)
self.helper_pickle_file(cPickle, protocol)
def test_pickle_p_mode(self): def test_pickle_p_mode(self):
# Arrange
import pickle
# Act / Assert # Act / Assert
for test_file in [ for test_file in [
"Tests/images/test-card.png", "Tests/images/test-card.png",
@ -76,18 +60,12 @@ class TestPickle(PillowTestCase):
) )
def test_pickle_pa_mode(self): def test_pickle_pa_mode(self):
# Arrange
import pickle
# Act / Assert # Act / Assert
for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1): for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1):
self.helper_pickle_string(pickle, protocol, mode="PA") self.helper_pickle_string(pickle, protocol, mode="PA")
self.helper_pickle_file(pickle, protocol, mode="PA") self.helper_pickle_file(pickle, protocol, mode="PA")
def test_pickle_l_mode(self): def test_pickle_l_mode(self):
# Arrange
import pickle
# Act / Assert # Act / Assert
for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1): for protocol in range(0, pickle.HIGHEST_PROTOCOL + 1):
self.helper_pickle_string(pickle, protocol, mode="L") self.helper_pickle_string(pickle, protocol, mode="L")
@ -95,8 +73,6 @@ class TestPickle(PillowTestCase):
def test_pickle_la_mode_with_palette(self): def test_pickle_la_mode_with_palette(self):
# Arrange # Arrange
import pickle
filename = self.tempfile("temp.pkl") filename = self.tempfile("temp.pkl")
with Image.open("Tests/images/hopper.jpg") as im: with Image.open("Tests/images/hopper.jpg") as im:
im = im.convert("PA") im = im.convert("PA")
@ -111,15 +87,3 @@ class TestPickle(PillowTestCase):
im.mode = "PA" im.mode = "PA"
self.assertEqual(im, loaded_im) self.assertEqual(im, loaded_im)
def test_cpickle_l_mode(self):
# Arrange
try:
import cPickle
except ImportError:
return
# Act / Assert
for protocol in range(0, cPickle.HIGHEST_PROTOCOL + 1):
self.helper_pickle_string(cPickle, protocol, mode="L")
self.helper_pickle_file(cPickle, protocol, mode="L")