Blob Blame History Raw
diff --git conda-4.4.11/tests/core/test_path_actions.py~ conda-4.4.11/tests/core/test_path_actions.py
index 2d499f4ae9..b9a6d14248 100644
--- conda-4.4.11/tests/core/test_path_actions.py~
+++ conda-4.4.11/tests/core/test_path_actions.py
@@ -13,7 +13,10 @@ from uuid import uuid4
 import pytest
 
 from conda._vendor.auxlib.collection import AttrDict
-from conda._vendor.toolz.itertoolz import groupby
+try:
+    from cytoolz.itertoolz import groupby
+except ImportError:
+    from conda._vendor.toolz.itertoolz import groupby
 from conda.base.constants import PREFIX_MAGIC_FILE
 from conda.base.context import context, reset_context
 from conda.common.compat import PY2, on_win
diff --git conda-4.4.11/tests/base/test_context.py~ conda-4.4.11/tests/base/test_context.py
index 9ddaa19939..d280afe8a5 100644
--- conda-4.4.11/tests/base/test_context.py~
+++ conda-4.4.11/tests/base/test_context.py
@@ -10,7 +10,10 @@ import pytest
 
 from conda._vendor.auxlib.collection import AttrDict
 from conda._vendor.auxlib.ish import dals
-from conda._vendor.toolz.itertoolz import concat
+try:
+    from cytoolz.itertoolz import concat
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat
 from conda.base.constants import PathConflict
 from conda.base.context import context, reset_context
 from conda.common.compat import odict
diff --git conda-4.4.11/tests/test_activate.py~ conda-4.4.11/tests/test_activate.py
index 564ab503d8..d8b533a78c 100644
--- conda-4.4.11/tests/test_activate.py~
+++ conda-4.4.11/tests/test_activate.py
@@ -13,7 +13,10 @@ import pytest
 
 from conda import CONDA_PACKAGE_ROOT
 from conda._vendor.auxlib.ish import dals
-from conda._vendor.toolz.itertoolz import concatv
+try:
+    from cytoolz.itertoolz import concatv
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concatv
 from conda.activate import Activator, main as activate_main, native_path_to_unix
 from conda.base.constants import ROOT_ENV_NAME
 from conda.base.context import context, reset_context