Skip to content

[FIX] Python 3.6 compatibility #1963

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

Merged
lanzagar merged 2 commits into from
Jan 27, 2017
Merged

[FIX] Python 3.6 compatibility #1963

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
c4e7e21
Use `ndarray.data` memory view in a call to sha1
ales-erjavec Jan 26, 2017
29a7922
tests: Suppress an expected NotImplementedError from a test
ales-erjavec Jan 26, 2017
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
3 changes: 2 additions & 1 deletion Orange/classification/majority.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ def fit_storage(self, dat):
probs = np.array(dist)
ties = np.flatnonzero(probs == probs.max())
if len(ties) > 1:
random_idx = int(sha1(bytes(dat.Y)).hexdigest(), 16) % len(ties)
random_idx = int(sha1(np.ascontiguousarray(dat.Y).data)
.hexdigest(), 16) % len(ties)
unif_maj = ties[random_idx]
else:
unif_maj = None
Expand Down
3 changes: 2 additions & 1 deletion Orange/classification/rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ def hash_dist(x):
hash : int
Hash function result.
"""
return int(sha1(bytes(x)).hexdigest(), base=16) & 0xffffffff
return int(sha1(np.ascontiguousarray(x).data)
.hexdigest(), base=16) & 0xffffffff


class Evaluator:
Expand Down
6 changes: 5 additions & 1 deletion Orange/tests/test_preprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ def test_refuse_data_in_constructor(self):
self.assertTrue(os.environ.get('ORANGE_DEPRECATIONS_ERROR'))
expected = self.assertRaises if is_CI else self.assertWarns
with expected(OrangeDeprecationWarning):
Orange.preprocess.preprocess.Preprocess(Table('iris'))
try:
Orange.preprocess.preprocess.Preprocess(Table('iris'))
except NotImplementedError:
# Expected from default Preprocess.__call__
pass


class RemoveConstant(unittest.TestCase):
Expand Down