Add conda._vendor.toolz fallback for tlz (conda#11709)

conda/activate.py

@@ -11,7 +11,10 @@
 import sys
 from textwrap import dedent
 
-from tlz.itertoolz import concatv, drop
+try:
+    from tlz.itertoolz import concatv, drop
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concatv, drop
 
 # Since we have to have configuration context here, anything imported by
 #   conda.base.context is fair game, but nothing more.

conda/base/context.py

@@ -17,7 +17,10 @@
 from datetime import datetime
 import warnings
 
-from tlz.itertoolz import concat, concatv, unique
+try:
+    from tlz.itertoolz import concat, concatv, unique
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, concatv, unique
 
 from .constants import (
     APP_NAME,

conda/cli/main_config.py

@@ -11,7 +11,10 @@
 import sys
 from textwrap import wrap
 
-from tlz.itertoolz import concat, groupby
+try:
+    from tlz.itertoolz import concat, groupby
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, groupby
 
 from .. import CondaError
 from ..auxlib.entity import EntityEncoder

conda/common/configuration.py

@@ -27,9 +27,14 @@
 from stat import S_IFDIR, S_IFMT, S_IFREG
 import sys
 
-from tlz.itertoolz import concat, concatv, unique
-from tlz.dicttoolz import merge, merge_with
-from tlz.functoolz import excepts
+try:
+    from tlz.itertoolz import concat, concatv, unique
+    from tlz.dicttoolz import merge, merge_with
+    from tlz.functoolz import excepts
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, concatv, unique
+    from conda._vendor.toolz.dicttoolz import merge, merge_with
+    from conda._vendor.toolz import excepts
 
 from .compat import isiterable, odict, primitive_types
 from .constants import NULL

conda/common/path.py

@@ -11,7 +11,10 @@
 import subprocess
 from urllib.parse import urlsplit
 
-from tlz.itertoolz import accumulate, concat
+try:
+    from tlz.itertoolz import accumulate, concat
+except ImportError:
+    from conda._vendor.toolz.itertoolz import accumulate, concat
 
 from .compat import on_win
 from .. import CondaError

conda/common/pkg_formats/python.py

@@ -18,7 +18,10 @@
 import sys
 import warnings
 
-from tlz.itertoolz import concat, concatv, groupby
+try:
+    from tlz.itertoolz import concat, concatv, groupby
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, concatv, groupby
 
 from ... import CondaError
 from ..compat import odict, open

conda/core/index.py

@@ -11,7 +11,10 @@
 import sys
 import warnings
 
-from tlz.itertoolz import concat, concatv
+try:
+    from tlz.itertoolz import concat, concatv
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, concatv
 
 from .package_cache_data import PackageCacheData
 from .prefix_data import PrefixData

conda/core/link.py

@@ -14,7 +14,10 @@
 from textwrap import indent
 import warnings
 
-from tlz.itertoolz import concat, concatv, interleave
+try:
+    from tlz.itertoolz import concat, concatv, interleave
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, concatv, interleave
 
 from .package_cache_data import PackageCacheData
 from .path_actions import (CompileMultiPycAction, CreateNonadminAction, CreatePrefixRecordAction,

conda/core/package_cache_data.py

@@ -13,7 +13,10 @@
 from sys import platform
 from tarfile import ReadError
 
-from tlz.itertoolz import concat, concatv, groupby
+try:
+    from tlz.itertoolz import concat, concatv, groupby
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, concatv, groupby
 
 from .path_actions import CacheUrlAction, ExtractPackageAction
 from .. import CondaError, CondaMultiError, conda_signal_handler

conda/core/path_actions.py

@@ -11,7 +11,10 @@
 import sys
 from uuid import uuid4
 
-from tlz.itertoolz import concat
+try:
+    from tlz.itertoolz import concat
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat
 
 from .envs_manager import get_user_environments_txt_file, register_env, unregister_env
 from .portability import _PaddingError, update_prefix

conda/core/solve.py

@@ -10,7 +10,10 @@
 import sys
 from textwrap import dedent
 
-from tlz.itertoolz import concat, concatv, groupby
+try:
+    from tlz.itertoolz import concat, concatv, groupby
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, concatv, groupby
 
 from .index import get_reduced_index, _supplement_index_with_system
 from .link import PrefixSetup, UnlinkLinkTransaction

conda/core/subdir_data.py

@@ -19,7 +19,10 @@
 from time import time
 import warnings
 
-from tlz.itertoolz import concat, take, groupby
+try:
+    from tlz.itertoolz import concat, groupby, take
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, groupby, take
 
 from .. import CondaError
 from ..auxlib.ish import dals

conda/exceptions.py

@@ -16,7 +16,10 @@
 from traceback import format_exception, format_exception_only
 import getpass
 
-from tlz.itertoolz import groupby
+try:
+    from tlz.itertoolz import groupby
+except ImportError:
+    from conda._vendor.toolz.itertoolz import groupby
 
 from .models.channel import Channel
 from .common.url import join_url, maybe_unquote

conda/history.py

@@ -16,7 +16,10 @@
 import time
 import warnings
 
-from tlz.itertoolz import groupby, take
+try:
+    from tlz.itertoolz import groupby, take
+except ImportError:
+    from conda._vendor.toolz.itertoolz import groupby, take
 
 from . import __version__ as CONDA_VERSION
 from .auxlib.ish import dals

conda/models/channel.py

@@ -7,7 +7,10 @@
 from itertools import chain
 from logging import getLogger
 
-from tlz.itertoolz import concat, concatv, drop
+try:
+    from tlz.itertoolz import concat, concatv, drop
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, concatv, drop
 
 from .._vendor.boltons.setutils import IndexedSet
 from ..base.constants import DEFAULTS_CHANNEL_NAME, MAX_CHANNEL_PRIORITY, UNKNOWN_CHANNEL

conda/models/match_spec.py

@@ -12,7 +12,10 @@
 from os.path import basename
 import re
 
-from tlz.itertoolz import concat, concatv, groupby
+try:
+    from tlz.itertoolz import concat, concatv, groupby
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, concatv, groupby
 
 from .channel import Channel
 from .version import BuildNumberMatch, VersionSpec

conda/models/version.py

@@ -7,7 +7,10 @@
 import re
 from itertools import zip_longest
 
-from tlz.functoolz import excepts
+try:
+    from tlz.functoolz import excepts
+except ImportError:
+    from conda._vendor.toolz.functoolz import excepts
 
 from ..exceptions import InvalidVersionSpec
 

conda/plan.py

@@ -16,7 +16,10 @@
 from logging import getLogger
 import sys
 
-from tlz.itertoolz import concatv
+try:
+    from tlz.itertoolz import concatv, groupby
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concatv, groupby
 
 from ._vendor.boltons.setutils import IndexedSet
 from .base.constants import DEFAULTS_CHANNEL_NAME, UNKNOWN_CHANNEL
@@ -370,7 +373,6 @@ def _plan_from_actions(actions, index):  # pragma: no cover
 
 def _inject_UNLINKLINKTRANSACTION(plan, index, prefix, axn, specs):  # pragma: no cover
     from os.path import isdir
-    from tlz.itertoolz import groupby
     from .models.dist import Dist
     from .instructions import LINK, PROGRESSIVEFETCHEXTRACT, UNLINK, UNLINKLINKTRANSACTION
     from .core.package_cache_data import ProgressiveFetchExtract

conda/resolve.py

@@ -8,9 +8,12 @@
 from functools import lru_cache
 from logging import DEBUG, getLogger
 
-from .auxlib.decorators import memoizemethod
-from tlz.itertoolz import concat, groupby
+try:
+    from tlz.itertoolz import concat, groupby
+except ImportError:
+    from conda._vendor.toolz.itertoolz import concat, groupby
 
+from .auxlib.decorators import memoizemethod
 from ._vendor.frozendict import FrozenOrderedDict as frozendict
 from ._vendor.tqdm import tqdm
 from .base.constants import ChannelPriority, MAX_CHANNEL_PRIORITY, SatSolverChoice