Skip to content

Fix for Python3 - ‘/’ -> '//' #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MoienBowen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for Python3 - ‘/’ -> '//' #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81e3b25
Fix for Python3 - ‘/’ -> '//'
May 24, 2019
77c99f3
add try import gmpy2
MoienBowen May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ecpy/utils/root.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def modular_square_root_extended(x):
c = x.field(random.randint(0, q**2), random.randint(0, q**2))
c0 = extended_legendre_symbol(c)
d = pow(c, (q - 1) // 2)
e = 1 / (c * d)
e = 1 // (c * d)
f = (c * d)**2
b = pow(a, (q - 1) // 4)
b2 = b**2
Expand Down Expand Up @@ -177,7 +177,7 @@ def cubic_root(x):
m = F.degree()
rho = 1
pm = p**m
r = (pm - 1) / 3
r = (pm - 1) // 3
rho = 1
while rho ** r == 1:
rho = F(random.randint(1, p - 1), random.randint(1, p - 1))
Expand All @@ -188,12 +188,12 @@ def cubic_root(x):
t += 1
else:
t -= 1
s = (pm - 1) / 3**t
s = (pm - 1) // 3**t
if (s + 1) % 3 == 0:
l = (s + 1) / 3
l = (s + 1) // 3
break
elif (s - 1) % 3 == 0:
l = (s - 1) / 3
l = (s - 1) // 3
break
a = rho ** s
a_ = rho ** (3**(t - 1) * s)
Expand All @@ -214,5 +214,5 @@ def cubic_root(x):
i += 1
r = x**l * h
if s == 3 * l + 1:
r = 1 / r
r = 1 // r
return r
6 changes: 5 additions & 1 deletion ecpy/utils/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,11 @@ def _check_external_modules():
_gmpy = gmpy
_is_prime = gmpy.is_prime
except ImportError:
_is_prime = miller_rabin
try import gmpy2
_gmpy = gmpy2
_is_prime = gmpy2.is_prime
except ImportError:
_is_prime = miller_rabin
try:
import ecpy.native
_native = ecpy.native
Expand Down