From 220baa9ab983d0d18b80165940f21ceee08d97e0 Mon Sep 17 00:00:00 2001
From: Athmane Madjoudj <athmane@fedoraproject.org>
Date: Sat, 12 May 2018 19:48:46 +0100
Subject: [PATCH] Fallback to system modules if vendorized one do not exist

---
 fabric/connection.py | 11 ++++++++---
 fabric/group.py      |  5 ++++-
 tests/connection.py  |  5 ++++-
 tests/runners.py     |  5 ++++-
 tests/transfer.py    |  5 ++++-
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/fabric/connection.py b/fabric/connection.py
index 24295c8a..d42284c8 100644
--- a/fabric/connection.py
+++ b/fabric/connection.py
@@ -1,10 +1,15 @@
 from contextlib import contextmanager
 from threading import Event
-from invoke.vendor.six import StringIO
+try:
+    from invoke.vendor.six import StringIO
+    from invoke.vendor.decorator import decorator
+    from invoke.vendor.six import string_types
+except ImportError:
+    from six import StringIO
+    from decorator import decorator
+    from six import string_types
 import socket
 
-from invoke.vendor.decorator import decorator
-from invoke.vendor.six import string_types
 
 from invoke import Context
 from invoke.exceptions import ThreadException
diff --git a/fabric/group.py b/fabric/group.py
index 6a0428ac..a2917c65 100644
--- a/fabric/group.py
+++ b/fabric/group.py
@@ -1,4 +1,7 @@
-from invoke.vendor.six.moves.queue import Queue
+try:
+    from invoke.vendor.six.moves.queue import Queue
+except ImportError:
+    from six.moves.queue import Queue
 
 from invoke.util import ExceptionHandlingThread
 
diff --git a/tests/connection.py b/tests/connection.py
index 952794ac..b212b5c5 100644
--- a/tests/connection.py
+++ b/tests/connection.py
@@ -1,5 +1,8 @@
 from itertools import chain, repeat
-from invoke.vendor.six import b
+try:
+    from invoke.vendor.six import b
+except ImportError:
+    from six import b
 import errno
 from os.path import join
 import socket
diff --git a/tests/runners.py b/tests/runners.py
index 080266a5..a7353f24 100644
--- a/tests/runners.py
+++ b/tests/runners.py
@@ -1,4 +1,7 @@
-from invoke.vendor.six import StringIO
+try:
+    from invoke.vendor.six import StringIO
+except ImportError:
+    from six import StringIO
 
 from invoke import pty_size, Result
 
diff --git a/tests/transfer.py b/tests/transfer.py
index 96eb4437..122f9746 100644
--- a/tests/transfer.py
+++ b/tests/transfer.py
@@ -1,4 +1,7 @@
-from invoke.vendor.six import StringIO
+try:
+    from invoke.vendor.six import StringIO
+except ImportError:
+    from six import StringIO
 
 from mock import Mock, call
 from pytest_relaxed import raises
-- 
2.17.0