zcy
/
svgpathtoolss
mirror of https://github.com/mathandy/svgpathtools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix issue with test failing due to hash builtin changing in python 3.2 then again in 3.8

pull/158/head
Andrew Port 2021-09-23 03:52:16 -07:00
parent 44d08b6737
commit 8b8ac6c9fe
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -3,7 +3,7 @@ import codecs
import os import os
VERSION = '1.4.2' VERSION = '1.4.1'
AUTHOR_NAME = 'Andy Port' AUTHOR_NAME = 'Andy Port'
AUTHOR_EMAIL = 'AndyAPort@gmail.com' AUTHOR_EMAIL = 'AndyAPort@gmail.com'
GITHUB = 'https://github.com/mathandy/svgpathtools' GITHUB = 'https://github.com/mathandy/svgpathtools'

33
test/test_path.py
View File

@ -1,6 +1,6 @@
# External dependencies # External dependencies
from __future__ import division, absolute_import, print_function from __future__ import division, absolute_import, print_function
import os
import sys import sys
import unittest import unittest
from math import sqrt, pi from math import sqrt, pi
@ -741,24 +741,37 @@ class TestPath(unittest.TestCase):
apath, line1, arc1, arc2, cub1, cub2, quad3, linez] apath, line1, arc1, arc2, cub1, cub2, quad3, linez]
# this is necessary due to changes to the builtin `hash` function # this is necessary due to changes to the builtin `hash` function
if sys.version_info.major + sys.version_info.minor < 3.8: python_version = sys.version_info.major + 0.1*sys.version_info.minor
expected_hashes = [ user_hash_seed = os.environ.get("PYTHONHASHSEED", "")
-5762846476463470127, -138736730317965290, -2005041722222729058, os.environ["PYTHONHASHSEED"] = "314"
8448700906794235291, -5178990533869800243, -4003140762934044601, if 3.8 <= python_version:
8575549467429100514, 5166859065265868968, 1373103287265872323,
-1022491904150314631, 4188352014604112779, -5090374009174854814,
-7093907105533857815, 2036243740727202243, -8108488067585685407]
else:
expected_hashes = [ expected_hashes = [
-6073024107272494569, -2519772625496438197, 8726412907710383506, -6073024107272494569, -2519772625496438197, 8726412907710383506,
2132930052750006195, 3112548573593977871, 991446120749438306, 2132930052750006195, 3112548573593977871, 991446120749438306,
-5589397644574569777, -4438808571483114580, -3125333407400456536, -5589397644574569777, -4438808571483114580, -3125333407400456536,
-4418099728831808951, 702646573139378041, -6331016786776229094, -4418099728831808951, 702646573139378041, -6331016786776229094,
5053050772929443013, 6102272282813527681, -5385294438006156225, 5053050772929443013, 6102272282813527681, -5385294438006156225
]
elif 3.2 <= python_version < 3.8:
expected_hashes = [
-5662973462929734898, 5166874115671195563, 5223434942701471389,
-7224979960884350294, -5178990533869800243, -4003140762934044601,
8575549467429100514, -6692132994808317852, 1594848578230132678,
-6374833902132909499, 4188352014604112779, -5090374009174854814,
-7093907105533857815, 2036243740727202243, -8108488067585685407
]
else:
expected_hashes = [
-5762846476463470127, -138736730317965290, -2005041722222729058,
8448700906794235291, -5178990533869800243, -4003140762934044601,
8575549467429100514, 5166859065265868968, 1373103287265872323,
-1022491904150314631, 4188352014604112779, -5090374009174854814,
-7093907105533857815, 2036243740727202243, -8108488067585685407
] ]
for c, h in zip(test_curves, expected_hashes): for c, h in zip(test_curves, expected_hashes):
self.assertTrue(hash(c) == h, msg="hash {} was expected for curve = {}".format(h, c)) self.assertTrue(hash(c) == h, msg="hash {} was expected for curve = {}".format(h, c))
os.environ["PYTHONHASHSEED"] = user_hash_seed # restore user's hash seed
def test_circle(self): def test_circle(self):
arc1 = Arc(0j, 100 + 100j, 0, 0, 0, 200 + 0j) arc1 = Arc(0j, 100 + 100j, 0, 0, 0, 200 + 0j)