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

Implement @hugovk's comments

Browse Source 
The `py36` flag now uses a tuple comparison to correctly handle future
major version. The unit test file also now uses `py36` as exported by
the _util module, rather than re-testing `sys.version_info`.
This commit is contained in:
Will Badart 2019-01-28 19:45:53 -05:00
parent adae7ecc6a
commit 07bff3e9b8
No known key found for this signature in database
GPG Key ID: 75CC5647CFEAA75E
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/test_util.py
View File

@ -4,8 +4,6 @@ from helper import unittest, PillowTestCase
from PIL import _util from PIL import _util
py36 = sys.version_info.major >= 3 and sys.version_info.minor >= 6
class TestUtil(PillowTestCase): class TestUtil(PillowTestCase):
@ -39,7 +37,7 @@ class TestUtil(PillowTestCase):
# Assert # Assert
self.assertTrue(it_is) self.assertTrue(it_is)
@unittest.skipIf(not py36, 'os.path support for Paths added in 3.6') @unittest.skipIf(not _util.py36, 'os.path support for Paths added in 3.6')
def test_path_obj_is_path(self): def test_path_obj_is_path(self):
# Arrange # Arrange
from pathlib import Path from pathlib import Path

2
src/PIL/_util.py
View File

@ -2,7 +2,7 @@ import os
import sys import sys
py3 = sys.version_info.major >= 3 py3 = sys.version_info.major >= 3
py36 = py3 and sys.version_info.minor >= 6 py36 = sys.version_info[0:2] >= (3, 6)
if py3: if py3:
def isStringType(t): def isStringType(t):