mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-03-20 04:51:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
aports/testing/exabgp/unvendor.patch
ptrcnull 3f89310682 testing/exabgp: upgrade to 4.2.22
2024-11-30 10:46:30 +00:00

577 lines
21 KiB
Diff
Raw Blame History

diff --git a/dev/profile/pyprof2calltree.py b/dev/profile/pyprof2calltree.py
index fc73a1d..668e602 100755
--- a/dev/profile/pyprof2calltree.py
+++ b/dev/profile/pyprof2calltree.py
@@ -36,7 +36,7 @@ import os
import sys
import tempfile
-from exabgp.vendoring import six
+import six
__all__ = ['convert', 'visualize', 'CalltreeConverter']
diff --git a/lib/exabgp/application/bgp.py b/lib/exabgp/application/bgp.py
index 0780b47..275bc5c 100755
--- a/lib/exabgp/application/bgp.py
+++ b/lib/exabgp/application/bgp.py
@@ -22,7 +22,7 @@ from exabgp.version import version
# import before the fork to improve copy on write memory savings
from exabgp.reactor.loop import Reactor
-from exabgp.vendoring import docopt
+import docopt
from exabgp.configuration.usage import usage
@@ -37,7 +37,7 @@ def is_bgp(s):
def __exit(memory, code):
if memory:
- from exabgp.vendoring import objgraph
+ import objgraph
sys.stdout.write('memory utilisation\n\n')
sys.stdout.write(objgraph.show_most_common_types(limit=20))
@@ -420,7 +420,7 @@ def run(env, comment, configurations, root, validate, pid=0):
exit_code = Reactor.Exit.unknown
raise
finally:
- from exabgp.vendoring import lsprofcalltree
+ import lsprofcalltree
profiler.disable()
kprofile = lsprofcalltree.KCacheGrind(profiler)
diff --git a/lib/exabgp/application/cli.py b/lib/exabgp/application/cli.py
index ab5a10d..e0ba811 100644
--- a/lib/exabgp/application/cli.py
+++ b/lib/exabgp/application/cli.py
@@ -24,7 +24,7 @@ from exabgp.application.control import check_fifo
from exabgp.reactor.network.error import error
from exabgp.reactor.api.response.answer import Answer
-from exabgp.vendoring import docopt
+import docopt
errno_block = set(
(
diff --git a/lib/exabgp/application/healthcheck.py b/lib/exabgp/application/healthcheck.py
index 7736cf4..8c265a2 100644
--- a/lib/exabgp/application/healthcheck.py
+++ b/lib/exabgp/application/healthcheck.py
@@ -57,8 +57,8 @@ import collections
logger = logging.getLogger("healthcheck")
# Python 3.3+ or backport
-from exabgp.vendoring.ipaddress import ip_network # pylint: disable=F0401
-from exabgp.vendoring.ipaddress import ip_address # pylint: disable=F0401
+from ipaddress import ip_network # pylint: disable=F0401
+from ipaddress import ip_address # pylint: disable=F0401
def fix(f):
diff --git a/lib/exabgp/bgp/message/open/capability/capabilities.py b/lib/exabgp/bgp/message/open/capability/capabilities.py
index 210542c..1a7962d 100644
--- a/lib/exabgp/bgp/message/open/capability/capabilities.py
+++ b/lib/exabgp/bgp/message/open/capability/capabilities.py
@@ -7,7 +7,7 @@ Copyright (c) 2009-2017 Exa Networks. All rights reserved.
License: 3-clause BSD. (See the COPYRIGHT file)
"""
-from exabgp.vendoring import six
+import six
from exabgp.protocol.family import AFI
from exabgp.protocol.family import SAFI
diff --git a/lib/exabgp/bgp/message/open/capability/graceful.py b/lib/exabgp/bgp/message/open/capability/graceful.py
index 8f87693..2950ff1 100644
--- a/lib/exabgp/bgp/message/open/capability/graceful.py
+++ b/lib/exabgp/bgp/message/open/capability/graceful.py
@@ -10,7 +10,7 @@ License: 3-clause BSD. (See the COPYRIGHT file)
from struct import pack
from struct import unpack
-from exabgp.vendoring import six
+import six
from exabgp.util import character
from exabgp.util import ordinal
diff --git a/lib/exabgp/bgp/message/update/attribute/attributes.py b/lib/exabgp/bgp/message/update/attribute/attributes.py
index d0f1a80..04c56e0 100644
--- a/lib/exabgp/bgp/message/update/attribute/attributes.py
+++ b/lib/exabgp/bgp/message/update/attribute/attributes.py
@@ -30,7 +30,7 @@ from exabgp.util import ordinal
from exabgp.logger import Logger
from exabgp.logger import LazyAttribute
-from exabgp.vendoring import six
+import six
class _NOTHING(object):
diff --git a/lib/exabgp/bgp/message/update/attribute/bgpls/link/admingroup.py b/lib/exabgp/bgp/message/update/attribute/bgpls/link/admingroup.py
index c21b570..49bfc86 100644
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/link/admingroup.py
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/link/admingroup.py
@@ -6,7 +6,7 @@ Created by Evelio Vila on 2016-12-01.
Copyright (c) 2014-2017 Exa Networks. All rights reserved.
"""
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
from exabgp.bgp.message.notification import Notify
from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE
diff --git a/lib/exabgp/bgp/message/update/attribute/bgpls/link/igpmetric.py b/lib/exabgp/bgp/message/update/attribute/bgpls/link/igpmetric.py
index c57ba19..0fe5ba1 100644
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/link/igpmetric.py
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/link/igpmetric.py
@@ -7,9 +7,9 @@ Copyright (c) 2014-2017 Exa Networks. All rights reserved.
"""
from struct import unpack
-from exabgp.vendoring import six
+import six
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
from exabgp.bgp.message.notification import Notify
from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE
diff --git a/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradj.py b/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradj.py
index b6dc588..2276a09 100644
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradj.py
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradj.py
@@ -8,10 +8,10 @@ Copyright (c) 2014-2017 Exa Networks. All rights reserved.
import json
from struct import unpack
-from exabgp.vendoring import six
+import six
from exabgp.util import hexstring
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE, LsGenericFlags
# draft-gredler-idr-bgp-ls-segment-routing-ext-03
diff --git a/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradjlan.py b/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradjlan.py
index 4ec1b82..0d6255a 100644
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradjlan.py
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradjlan.py
@@ -8,10 +8,10 @@ Copyright (c) 2014-2017 Exa Networks. All rights reserved.
import json
from struct import unpack
-from exabgp.vendoring import six
+import six
from exabgp.util import hexstring
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
from exabgp.protocol.iso import ISO
from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE, LsGenericFlags
from exabgp.bgp.message.notification import Notify
diff --git a/lib/exabgp/bgp/message/update/attribute/bgpls/linkstate.py b/lib/exabgp/bgp/message/update/attribute/bgpls/linkstate.py
index c1ae183..d596a76 100644
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/linkstate.py
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/linkstate.py
@@ -11,7 +11,7 @@ import itertools
from struct import unpack
from exabgp.util import concat_strs
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
from exabgp.bgp.message.notification import Notify
from exabgp.bgp.message.update.attribute.attribute import Attribute
diff --git a/lib/exabgp/bgp/message/update/attribute/bgpls/node/isisarea.py b/lib/exabgp/bgp/message/update/attribute/bgpls/node/isisarea.py
index 7644105..f4ba7d4 100644
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/node/isisarea.py
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/node/isisarea.py
@@ -6,7 +6,7 @@ Created by Evelio Vila on 2016-12-01.
Copyright (c) 2014-2017 Exa Networks. All rights reserved.
"""
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
from exabgp.bgp.message.notification import Notify
diff --git a/lib/exabgp/bgp/message/update/attribute/bgpls/node/sralgo.py b/lib/exabgp/bgp/message/update/attribute/bgpls/node/sralgo.py
index 0afe8f5..572fd15 100644
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/node/sralgo.py
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/node/sralgo.py
@@ -8,7 +8,7 @@ Copyright (c) 2014-2017 Exa Networks. All rights reserved.
import json
from struct import unpack
-from exabgp.vendoring import six
+import six
from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE
diff --git a/lib/exabgp/bgp/message/update/attribute/bgpls/node/srcap.py b/lib/exabgp/bgp/message/update/attribute/bgpls/node/srcap.py
index c5ef17c..ab8662c 100644
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/node/srcap.py
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/node/srcap.py
@@ -9,7 +9,7 @@ Copyright (c) 2014-2017 Exa Networks. All rights reserved.
import json
from struct import unpack
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE, LsGenericFlags
from exabgp.bgp.message.notification import Notify
diff --git a/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/prefixmetric.py b/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/prefixmetric.py
index be76423..686c009 100644
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/prefixmetric.py
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/prefixmetric.py
@@ -8,7 +8,7 @@ Copyright (c) 2014-2017 Exa Networks. All rights reserved.
from struct import unpack
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
from exabgp.bgp.message.notification import Notify
from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE
diff --git a/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/srprefix.py b/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/srprefix.py
index bb991e5..7f791dc 100644
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/srprefix.py
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/srprefix.py
@@ -8,10 +8,10 @@ Copyright (c) 2014-2017 Exa Networks. All rights reserved.
import json
from struct import unpack
-from exabgp.vendoring import six
+import six
from exabgp.util import hexstring
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
from exabgp.bgp.message.notification import Notify
from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE, LsGenericFlags
diff --git a/lib/exabgp/bgp/message/update/attribute/mprnlri.py b/lib/exabgp/bgp/message/update/attribute/mprnlri.py
index 95b8da1..871f8a8 100644
--- a/lib/exabgp/bgp/message/update/attribute/mprnlri.py
+++ b/lib/exabgp/bgp/message/update/attribute/mprnlri.py
@@ -9,7 +9,7 @@ License: 3-clause BSD. (See the COPYRIGHT file)
from struct import unpack
-from exabgp.vendoring import six
+import six
from exabgp.util import concat_bytes
from exabgp.util import concat_bytes_i
diff --git a/lib/exabgp/bgp/message/update/attribute/sr/prefixsid.py b/lib/exabgp/bgp/message/update/attribute/sr/prefixsid.py
index 9d7c5a6..b529f2c 100644
--- a/lib/exabgp/bgp/message/update/attribute/sr/prefixsid.py
+++ b/lib/exabgp/bgp/message/update/attribute/sr/prefixsid.py
@@ -8,7 +8,7 @@ Copyright (c) 2009-2017 Exa Networks. All rights reserved.
import binascii
from struct import unpack
-from exabgp.vendoring import six
+import six
from exabgp.util import concat_bytes_i
from exabgp.bgp.message.update.attribute.attribute import Attribute
diff --git a/lib/exabgp/bgp/message/update/attribute/sr/srgb.py b/lib/exabgp/bgp/message/update/attribute/sr/srgb.py
index 540d23e..c56ea59 100644
--- a/lib/exabgp/bgp/message/update/attribute/sr/srgb.py
+++ b/lib/exabgp/bgp/message/update/attribute/sr/srgb.py
@@ -9,7 +9,7 @@ import json
from struct import pack
from exabgp.util import concat_bytes
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
from exabgp.bgp.message.notification import Notify
from exabgp.bgp.message.update.attribute.sr.prefixsid import PrefixSid
diff --git a/lib/exabgp/bgp/message/update/nlri/bgpls/tlvs/ipreach.py b/lib/exabgp/bgp/message/update/nlri/bgpls/tlvs/ipreach.py
index 706fe86..23d62b3 100644
--- a/lib/exabgp/bgp/message/update/nlri/bgpls/tlvs/ipreach.py
+++ b/lib/exabgp/bgp/message/update/nlri/bgpls/tlvs/ipreach.py
@@ -10,7 +10,7 @@ License: 3-clause BSD. (See the COPYRIGHT file)
from __future__ import division
from struct import unpack
import math
-from exabgp.vendoring import ipaddress
+import ipaddress
from exabgp.protocol.ip import IP
from exabgp.util import ordinal
diff --git a/lib/exabgp/bgp/message/update/nlri/vpls.py b/lib/exabgp/bgp/message/update/nlri/vpls.py
index 0c9e329..033d254 100644
--- a/lib/exabgp/bgp/message/update/nlri/vpls.py
+++ b/lib/exabgp/bgp/message/update/nlri/vpls.py
@@ -10,7 +10,7 @@ License: 3-clause BSD. (See the COPYRIGHT file)
from struct import unpack
from struct import pack
-from exabgp.vendoring import six
+import six
from exabgp.util import concat_bytes
from exabgp.protocol.ip import IP
from exabgp.protocol.family import AFI
diff --git a/lib/exabgp/bgp/neighbor.py b/lib/exabgp/bgp/neighbor.py
index f73ef19..c5d73d6 100644
--- a/lib/exabgp/bgp/neighbor.py
+++ b/lib/exabgp/bgp/neighbor.py
@@ -15,7 +15,7 @@ from collections import deque
try:
from collections import Counter
except ImportError:
- from exabgp.vendoring.counter import Counter
+ from counter import Counter
from exabgp.protocol.family import AFI
diff --git a/lib/exabgp/configuration/configuration.py b/lib/exabgp/configuration/configuration.py
index ee4ae8c..75dc46f 100644
--- a/lib/exabgp/configuration/configuration.py
+++ b/lib/exabgp/configuration/configuration.py
@@ -10,7 +10,7 @@ License: 3-clause BSD. (See the COPYRIGHT file)
import os
import sys
-from exabgp.vendoring import six
+import six
from exabgp.logger import Logger
diff --git a/lib/exabgp/configuration/core/scope.py b/lib/exabgp/configuration/core/scope.py
index 70352b8..cb2aed7 100644
--- a/lib/exabgp/configuration/core/scope.py
+++ b/lib/exabgp/configuration/core/scope.py
@@ -11,7 +11,7 @@ import sys
import pprint
# from copy import deepcopy
-from exabgp.vendoring import six
+import six
from exabgp.protocol.ip import IP
from exabgp.configuration.core.error import Error
diff --git a/lib/exabgp/configuration/core/tokeniser.py b/lib/exabgp/configuration/core/tokeniser.py
index 9164bba..90273c7 100644
--- a/lib/exabgp/configuration/core/tokeniser.py
+++ b/lib/exabgp/configuration/core/tokeniser.py
@@ -10,7 +10,7 @@ License: 3-clause BSD. (See the COPYRIGHT file)
from exabgp.configuration.core.format import tokens
from exabgp.protocol.family import AFI
from collections import deque
-from exabgp.vendoring import six
+import six
class Tokeniser(object):
diff --git a/lib/exabgp/configuration/environment.py b/lib/exabgp/configuration/environment.py
index 20e98d3..cde47fb 100644
--- a/lib/exabgp/configuration/environment.py
+++ b/lib/exabgp/configuration/environment.py
@@ -315,7 +315,7 @@ class environment(object):
# ========================================================================= _env
#
-from exabgp.vendoring.six.moves import configparser as ConfigParser
+from six.moves import configparser as ConfigParser
from exabgp.util.hashtable import HashTable
diff --git a/lib/exabgp/protocol/iso/__init__.py b/lib/exabgp/protocol/iso/__init__.py
index fb483d3..fa6a5f2 100644
--- a/lib/exabgp/protocol/iso/__init__.py
+++ b/lib/exabgp/protocol/iso/__init__.py
@@ -10,7 +10,7 @@ Copyright (c) 2009-2017 Exa Networks. All rights reserved.
# =========================================================================== ISO
#
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
class ISO(object):
diff --git a/lib/exabgp/reactor/api/response/json.py b/lib/exabgp/reactor/api/response/json.py
index a1fb6e5..6467fa2 100755
--- a/lib/exabgp/reactor/api/response/json.py
+++ b/lib/exabgp/reactor/api/response/json.py
@@ -14,7 +14,7 @@ import sys
import time
import signal
-from exabgp.vendoring import six
+import six
from exabgp.util import hexstring
diff --git a/lib/exabgp/reactor/asynchronous.py b/lib/exabgp/reactor/asynchronous.py
index 837a4ff..6f5bcc2 100644
--- a/lib/exabgp/reactor/asynchronous.py
+++ b/lib/exabgp/reactor/asynchronous.py
@@ -10,7 +10,7 @@ License: 3-clause BSD. (See the COPYRIGHT file)
from collections import deque
from exabgp.logger import Logger
-from exabgp.vendoring import six
+import six
class ASYNC(object):
diff --git a/lib/exabgp/reactor/keepalive.py b/lib/exabgp/reactor/keepalive.py
index 3ad9937..f986e9a 100644
--- a/lib/exabgp/reactor/keepalive.py
+++ b/lib/exabgp/reactor/keepalive.py
@@ -6,7 +6,7 @@ Created by Thomas Mangin on 2009-08-25.
Copyright (c) 2017-2017 Exa Networks. All rights reserved.
"""
-from exabgp.vendoring import six
+import six
from exabgp.bgp.timer import SendTimer
from exabgp.bgp.message import Notify
diff --git a/lib/exabgp/reactor/network/outgoing.py b/lib/exabgp/reactor/network/outgoing.py
index 892342d..94d9180 100644
--- a/lib/exabgp/reactor/network/outgoing.py
+++ b/lib/exabgp/reactor/network/outgoing.py
@@ -1,6 +1,6 @@
import time
-from exabgp.vendoring import six
+import six
from exabgp.protocol.family import AFI
from .connection import Connection
diff --git a/lib/exabgp/reactor/peer.py b/lib/exabgp/reactor/peer.py
index 6cd6cb1..3670f51 100644
--- a/lib/exabgp/reactor/peer.py
+++ b/lib/exabgp/reactor/peer.py
@@ -11,7 +11,7 @@ import time
from collections import defaultdict
# import traceback
-from exabgp.vendoring import six
+import six
from exabgp.util import ordinal
from exabgp.bgp.timer import ReceiveTimer
from exabgp.bgp.message import Message
diff --git a/lib/exabgp/reactor/protocol.py b/lib/exabgp/reactor/protocol.py
index 1c4b038..fef51ad 100644
--- a/lib/exabgp/reactor/protocol.py
+++ b/lib/exabgp/reactor/protocol.py
@@ -9,7 +9,7 @@ License: 3-clause BSD. (See the COPYRIGHT file)
import os
-from exabgp.vendoring import six
+import six
import traceback
# ================================================================ Registration
diff --git a/lib/exabgp/rib/outgoing.py b/lib/exabgp/rib/outgoing.py
index 00b2495..a7907cc 100644
--- a/lib/exabgp/rib/outgoing.py
+++ b/lib/exabgp/rib/outgoing.py
@@ -21,7 +21,7 @@ from exabgp.rib.cache import Cache
if sys.version_info[0] >= 3 and sys.version_info[1] >= 6:
RIBdict = dict
else:
- from exabgp.vendoring.ordereddict import OrderedDict as RIBdict
+ from ordereddict import OrderedDict as RIBdict
class OutgoingRIB(Cache):
diff --git a/lib/exabgp/util/coroutine.py b/lib/exabgp/util/coroutine.py
index a54b0bd..7e6bbbb 100644
--- a/lib/exabgp/util/coroutine.py
+++ b/lib/exabgp/util/coroutine.py
@@ -8,7 +8,7 @@ License: 3-clause BSD. (See the COPYRIGHT file)
"""
from functools import wraps
-from exabgp.vendoring import six
+import six
def each(function):
diff --git a/lib/exabgp/util/trace.py b/lib/exabgp/util/trace.py
index a5a3a91..f23acb2 100644
--- a/lib/exabgp/util/trace.py
+++ b/lib/exabgp/util/trace.py
@@ -9,7 +9,7 @@ License: 3-clause BSD. (See the COPYRIGHT file)
import traceback
-from exabgp.vendoring.six.moves import StringIO
+from six.moves import StringIO
def trace():
diff --git a/lib/exabgp/vendoring/cmd2.py b/lib/exabgp/vendoring/cmd2.py
index 9b179ec..d7e5c38 100644
--- a/lib/exabgp/vendoring/cmd2.py
+++ b/lib/exabgp/vendoring/cmd2.py
@@ -38,10 +38,10 @@ import glob
import traceback
import platform
import copy
-from exabgp.vendoring import six
+import six
from code import InteractiveConsole, InteractiveInterpreter
from optparse import make_option
-from exabgp.vendoring import pyparsing
+import pyparsing
__version__ = '0.6.8'
diff --git a/qa/tests/cache_test.py b/qa/tests/cache_test.py
index 3a8dc94..721f85c 100755
--- a/qa/tests/cache_test.py
+++ b/qa/tests/cache_test.py
@@ -12,9 +12,9 @@ import unittest
import time
from exabgp.util.cache import Cache
-from exabgp.vendoring import six
+import six
-from exabgp.vendoring.six.moves import xrange
+from six.moves import xrange
class TestCache(unittest.TestCase):
diff --git a/qa/tests/connection.py b/qa/tests/connection.py
index 1586daf..8092ea5 100755
--- a/qa/tests/connection.py
+++ b/qa/tests/connection.py
@@ -15,7 +15,7 @@ import cProfile
import unittest
from exabgp.util.od import od
-from exabgp.vendoring import six
+import six
def test():
diff --git a/qa/tests/protocol.py b/qa/tests/protocol.py
index 67e8e21..31c8a03 100755
--- a/qa/tests/protocol.py
+++ b/qa/tests/protocol.py
@@ -23,8 +23,8 @@ from exabgp.bgp.message.update import Attributes
from exabgp.reactor.protocol import Protocol
from exabgp.bgp.neighbor import Neighbor
-from exabgp.vendoring import six
-from exabgp.vendoring.six.moves import StringIO
+import six
+from six.moves import StringIO
from exabgp.configuration.environment import environment
Reference in New Issue View Git Blame Copy Permalink