python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-13 18:56:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Version check rather than try/except

Browse Source
This commit is contained in:
wiredfool 2016-01-03 13:04:04 -08:00
parent 21beef192a
commit 859ce84976
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/test_image_getim.py
View File

@ -1,5 +1,5 @@
from helper import unittest, PillowTestCase, hopper, py3 from helper import unittest, PillowTestCase, hopper, py3
import sys
class TestImageGetIm(PillowTestCase): class TestImageGetIm(PillowTestCase):
@ -11,10 +11,10 @@ class TestImageGetIm(PillowTestCase):
self.assertIn("PyCapsule", type_repr) self.assertIn("PyCapsule", type_repr)
try: if sys.hexversion < 0x2070000:
#py2.6 # py2.6 x64, windows
target_types = (int, long) target_types = (int, long)
except: else:
target_types = (int) target_types = (int)
self.assertIsInstance(im.im.id, target_types) self.assertIsInstance(im.im.id, target_types)

2
Tests/test_imagewin_pointers.py
View File

@ -74,7 +74,7 @@ if sys.platform.startswith('win32'):
memcpy(bp + bf.bfOffBits, pixels, bi.biSizeImage) memcpy(bp + bf.bfOffBits, pixels, bi.biSizeImage)
try: try:
return bytearray(buf) return bytearray(buf)
except: except ValueError:
# py2.6 # py2.6
return buffer(buf)[:] return buffer(buf)[:]