|
|
4bbc54a |
From ced931db84ca5a1d3833c6c6fc9f8c11815e462a Mon Sep 17 00:00:00 2001
|
|
|
4bbc54a |
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
|
|
|
4bbc54a |
Date: Fri, 4 Jun 2021 12:46:06 -0400
|
|
|
4bbc54a |
Subject: [PATCH 3/3] Finish wrapping invoke.vendor.* imports so standalone
|
|
|
4bbc54a |
packages can be used
|
|
|
4bbc54a |
|
|
|
4bbc54a |
---
|
|
|
4bbc54a |
integration/concurrency.py | 8 ++++++--
|
|
|
4bbc54a |
tests/_util.py | 5 ++++-
|
|
|
4bbc54a |
tests/config.py | 5 ++++-
|
|
|
4bbc54a |
tests/connection.py | 3 ++-
|
|
|
4bbc54a |
4 files changed, 16 insertions(+), 5 deletions(-)
|
|
|
4bbc54a |
|
|
|
4bbc54a |
diff --git a/integration/concurrency.py b/integration/concurrency.py
|
|
|
4bbc54a |
index 99c80092..990f9e87 100644
|
|
|
4bbc54a |
--- a/integration/concurrency.py
|
|
|
4bbc54a |
+++ b/integration/concurrency.py
|
|
|
4bbc54a |
@@ -1,7 +1,11 @@
|
|
|
4bbc54a |
import codecs
|
|
|
4bbc54a |
|
|
|
4bbc54a |
-from invoke.vendor.six.moves.queue import Queue
|
|
|
4bbc54a |
-from invoke.vendor.six.moves import zip_longest
|
|
|
4bbc54a |
+try:
|
|
|
4bbc54a |
+ from invoke.vendor.six.moves.queue import Queue
|
|
|
4bbc54a |
+ from invoke.vendor.six.moves import zip_longest
|
|
|
4bbc54a |
+except ImportError:
|
|
|
4bbc54a |
+ from six.moves.queue import Queue
|
|
|
4bbc54a |
+ from six.moves import zip_longest
|
|
|
4bbc54a |
|
|
|
4bbc54a |
from invoke.util import ExceptionHandlingThread
|
|
|
4bbc54a |
from pytest import skip
|
|
|
4bbc54a |
diff --git a/tests/_util.py b/tests/_util.py
|
|
|
4bbc54a |
index 3a008745..1ffbc849 100644
|
|
|
4bbc54a |
--- a/tests/_util.py
|
|
|
4bbc54a |
+++ b/tests/_util.py
|
|
|
4bbc54a |
@@ -3,7 +3,10 @@ import os
|
|
|
4bbc54a |
import re
|
|
|
4bbc54a |
import sys
|
|
|
4bbc54a |
|
|
|
4bbc54a |
-from invoke.vendor.lexicon import Lexicon
|
|
|
4bbc54a |
+try:
|
|
|
4bbc54a |
+ from invoke.vendor.lexicon import Lexicon
|
|
|
4bbc54a |
+except ImportError:
|
|
|
4bbc54a |
+ from lexicon import Lexicon
|
|
|
4bbc54a |
from pytest_relaxed import trap
|
|
|
4bbc54a |
|
|
|
4bbc54a |
from fabric.main import make_program
|
|
|
4bbc54a |
diff --git a/tests/config.py b/tests/config.py
|
|
|
4bbc54a |
index 4173f7a2..abbbb4b5 100644
|
|
|
4bbc54a |
--- a/tests/config.py
|
|
|
4bbc54a |
+++ b/tests/config.py
|
|
|
4bbc54a |
@@ -2,7 +2,10 @@ import errno
|
|
|
4bbc54a |
from os.path import join, expanduser
|
|
|
4bbc54a |
|
|
|
4bbc54a |
from paramiko.config import SSHConfig
|
|
|
4bbc54a |
-from invoke.vendor.lexicon import Lexicon
|
|
|
4bbc54a |
+try:
|
|
|
4bbc54a |
+ from invoke.vendor.lexicon import Lexicon
|
|
|
4bbc54a |
+except ImportError:
|
|
|
4bbc54a |
+ from lexicon import Lexicon
|
|
|
4bbc54a |
|
|
|
4bbc54a |
from fabric import Config
|
|
|
4bbc54a |
from fabric.util import get_local_user
|
|
|
4bbc54a |
diff --git a/tests/connection.py b/tests/connection.py
|
|
|
4bbc54a |
index f41958d3..5ae2671b 100644
|
|
|
4bbc54a |
--- a/tests/connection.py
|
|
|
4bbc54a |
+++ b/tests/connection.py
|
|
|
4bbc54a |
@@ -2,8 +2,10 @@ from itertools import chain, repeat
|
|
|
4bbc54a |
|
|
|
4bbc54a |
try:
|
|
|
4bbc54a |
from invoke.vendor.six import b
|
|
|
4bbc54a |
+ from invoke.vendor.lexicon import Lexicon
|
|
|
4bbc54a |
except ImportError:
|
|
|
4bbc54a |
from six import b
|
|
|
4bbc54a |
+ from lexicon import Lexicon
|
|
|
4bbc54a |
import errno
|
|
|
4bbc54a |
from os.path import join
|
|
|
4bbc54a |
import socket
|
|
|
4bbc54a |
@@ -15,7 +17,6 @@ from paramiko import SSHConfig
|
|
|
4bbc54a |
import pytest # for mark
|
|
|
4bbc54a |
from pytest import skip, param
|
|
|
4bbc54a |
from pytest_relaxed import raises
|
|
|
4bbc54a |
-from invoke.vendor.lexicon import Lexicon
|
|
|
4bbc54a |
|
|
|
4bbc54a |
from invoke.config import Config as InvokeConfig
|
|
|
4bbc54a |
from invoke.exceptions import ThreadException
|
|
|
4bbc54a |
--
|
|
|
4bbc54a |
2.31.1
|
|
|
4bbc54a |
|