From ced931db84ca5a1d3833c6c6fc9f8c11815e462a Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 4 Jun 2021 12:46:06 -0400
Subject: [PATCH 3/3] Finish wrapping invoke.vendor.* imports so standalone
 packages can be used

---
 integration/concurrency.py | 8 ++++++--
 tests/_util.py             | 5 ++++-
 tests/config.py            | 5 ++++-
 tests/connection.py        | 3 ++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/integration/concurrency.py b/integration/concurrency.py
index 99c80092..990f9e87 100644
--- a/integration/concurrency.py
+++ b/integration/concurrency.py
@@ -1,7 +1,11 @@
 import codecs
 
-from invoke.vendor.six.moves.queue import Queue
-from invoke.vendor.six.moves import zip_longest
+try:
+    from invoke.vendor.six.moves.queue import Queue
+    from invoke.vendor.six.moves import zip_longest
+except ImportError:
+    from six.moves.queue import Queue
+    from six.moves import zip_longest
 
 from invoke.util import ExceptionHandlingThread
 from pytest import skip
diff --git a/tests/_util.py b/tests/_util.py
index 3a008745..1ffbc849 100644
--- a/tests/_util.py
+++ b/tests/_util.py
@@ -3,7 +3,10 @@ import os
 import re
 import sys
 
-from invoke.vendor.lexicon import Lexicon
+try:
+    from invoke.vendor.lexicon import Lexicon
+except ImportError:
+    from lexicon import Lexicon
 from pytest_relaxed import trap
 
 from fabric.main import make_program
diff --git a/tests/config.py b/tests/config.py
index 4173f7a2..abbbb4b5 100644
--- a/tests/config.py
+++ b/tests/config.py
@@ -2,7 +2,10 @@ import errno
 from os.path import join, expanduser
 
 from paramiko.config import SSHConfig
-from invoke.vendor.lexicon import Lexicon
+try:
+    from invoke.vendor.lexicon import Lexicon
+except ImportError:
+    from lexicon import Lexicon
 
 from fabric import Config
 from fabric.util import get_local_user
diff --git a/tests/connection.py b/tests/connection.py
index f41958d3..5ae2671b 100644
--- a/tests/connection.py
+++ b/tests/connection.py
@@ -2,8 +2,10 @@ from itertools import chain, repeat
 
 try:
     from invoke.vendor.six import b
+    from invoke.vendor.lexicon import Lexicon
 except ImportError:
     from six import b
+    from lexicon import Lexicon
 import errno
 from os.path import join
 import socket
@@ -15,7 +17,6 @@ from paramiko import SSHConfig
 import pytest  # for mark
 from pytest import skip, param
 from pytest_relaxed import raises
-from invoke.vendor.lexicon import Lexicon
 
 from invoke.config import Config as InvokeConfig
 from invoke.exceptions import ThreadException
-- 
2.31.1