Skip to content

Commit 71d08b6

Browse files
Stopgap change so we depend on the euclid3 module (https://pypi.python.org/pypi/euclid3/0.01), not the original PyEuclid. Works for Py2 & Py3
This is unfortunate since the code in the current master repo of PyEuclid at https://github.com/ezag/pyeuclid has been Python3-compatible for at least a year. However, the original PyPI maintainer of PyEuclid is unresponsive, so ezag can't update the PyPI dependency as of December 2016. Optimally, he'll be able to take over the original package name at some point in the future, release a new version on PyPI and we can go back to the original dependency. Until then, this should serve
1 parent e640c44 commit 71d08b6

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

solid/examples/koch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from solid import *
88
from solid.utils import *
99

10-
from euclid import *
10+
from euclid3 import *
1111

1212
ONE_THIRD = 1 / 3.0
1313

solid/patch_euclid.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import euclid
2-
from euclid import *
1+
import euclid3
2+
from euclid3 import *
33

44
from solid.utils import * # Only needed for EPSILON. Tacky.
55

@@ -25,7 +25,7 @@ def _intersect_line3_line3(A, B):
2525
# Connect A & B
2626
# If the length of the connecting segment is 0, they intersect
2727
# at the endpoint(s) of the connecting segment
28-
sol = euclid._connect_line3_line3(A, B)
28+
sol = euclid3._connect_line3_line3(A, B)
2929
# TODO: Ray3 and LineSegment3 would like to be able to know
3030
# if their intersection points fall within the segment.
3131
if sol.magnitude_squared() < EPSILON:

solid/screw_thread.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from solid import *
88
from solid.utils import *
9-
from euclid import *
9+
from euclid3 import *
1010
# NOTE: The PyEuclid on PyPi doesn't include several elements added to
1111
# the module as of 13 Feb 2013. Add them here until euclid supports them
1212
# TODO: when euclid updates, remove this cruft. -ETJ 13 Feb 2013

solid/test/test_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from solid import *
1010
from solid.utils import *
11-
from euclid import *
11+
from euclid3 import *
1212
import difflib
1313
from solid.test.ExpandedTestCase import DiffOutput
1414

solid/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,8 +685,8 @@ def nut(screw_type='m3'):
685685
# = PyEuclid Utils =
686686
# = -------------- =
687687
try:
688-
import euclid
689-
from euclid import *
688+
import euclid3
689+
from euclid3 import *
690690
# NOTE: The PyEuclid on PyPi doesn't include several elements added to
691691
# the module as of 13 Feb 2013. Add them here until euclid supports them
692692
# TODO: when euclid updates, remove this cruft. -ETJ 13 Feb 2013

0 commit comments

Comments
 (0)