mirrors/aports
3
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-04-12 16:06:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
aports/testing/exabgp/unvendor.patch
Sean McAvoy f119a30415 testing/exabgp: upgrade to 4.2.24
2025-03-15 18:35:35 +00:00

507 lines
21 KiB
Diff
Raw Permalink Blame History

diff -u -r exabgp-4.2.24/dev/profile/pyprof2calltree.py Aexabgp-4.2.24/dev/profile/pyprof2calltree.py
--- a/dev/profile/pyprof2calltree.py 2025-03-10 17:54:24.000000000 -0400
+++ b/dev/profile/pyprof2calltree.py 2025-03-15 14:26:19.802319215 -0400
@@ -36,7 +36,7 @@
import sys
import tempfile
-from exabgp.vendoring import six
+import six
__all__ = ['convert', 'visualize', 'CalltreeConverter']
diff -u -r exabgp-4.2.24/lib/exabgp/application/bgp.py Aexabgp-4.2.24/lib/exabgp/application/bgp.py
--- a/lib/exabgp/application/bgp.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/application/bgp.py 2025-03-15 14:26:19.732319365 -0400
@@ -23,7 +23,7 @@
# 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
@@ -38,7 +38,7 @@
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))
@@ -421,7 +421,7 @@
exit_code = Reactor.Exit.unknown
raise
finally:
- from exabgp.vendoring import lsprofcalltree
+ import lsprofcalltree
profiler.disable()
kprofile = lsprofcalltree.KCacheGrind(profiler)
diff -u -r exabgp-4.2.24/lib/exabgp/application/cli.py Aexabgp-4.2.24/lib/exabgp/application/cli.py
--- a/lib/exabgp/application/cli.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/application/cli.py 2025-03-15 14:26:19.728986039 -0400
@@ -24,7 +24,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/application/healthcheck.py Aexabgp-4.2.24/lib/exabgp/application/healthcheck.py
--- a/lib/exabgp/application/healthcheck.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/application/healthcheck.py 2025-03-15 14:26:19.728986039 -0400
@@ -57,8 +57,8 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/open/capability/capabilities.py Aexabgp-4.2.24/lib/exabgp/bgp/message/open/capability/capabilities.py
--- a/lib/exabgp/bgp/message/open/capability/capabilities.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/open/capability/capabilities.py 2025-03-15 14:26:19.795652562 -0400
@@ -7,7 +7,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/open/capability/graceful.py Aexabgp-4.2.24/lib/exabgp/bgp/message/open/capability/graceful.py
--- a/lib/exabgp/bgp/message/open/capability/graceful.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/open/capability/graceful.py 2025-03-15 14:26:19.795652562 -0400
@@ -10,7 +10,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/attributes.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/attributes.py
--- a/lib/exabgp/bgp/message/update/attribute/attributes.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/attributes.py 2025-03-15 14:26:19.782319257 -0400
@@ -30,7 +30,7 @@
from exabgp.logger import Logger
from exabgp.logger import LazyAttribute
-from exabgp.vendoring import six
+import six
class _NOTHING(object):
diff -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/link/admingroup.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/link/admingroup.py
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/link/admingroup.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/link/admingroup.py 2025-03-15 14:26:19.792319236 -0400
@@ -6,7 +6,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/link/igpmetric.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/link/igpmetric.py
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/link/igpmetric.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/link/igpmetric.py 2025-03-15 14:26:19.792319236 -0400
@@ -7,9 +7,9 @@
"""
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradj.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradj.py
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradj.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradj.py 2025-03-15 14:26:19.792319236 -0400
@@ -8,10 +8,10 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradjlan.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradjlan.py
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradjlan.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/link/sradjlan.py 2025-03-15 14:26:19.792319236 -0400
@@ -8,10 +8,10 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/linkstate.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/linkstate.py
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/linkstate.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/linkstate.py 2025-03-15 14:26:19.792319236 -0400
@@ -11,7 +11,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/node/isisarea.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/node/isisarea.py
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/node/isisarea.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/node/isisarea.py 2025-03-15 14:26:19.792319236 -0400
@@ -6,7 +6,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/node/sralgo.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/node/sralgo.py
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/node/sralgo.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/node/sralgo.py 2025-03-15 14:26:19.788985910 -0400
@@ -8,7 +8,7 @@
import json
from struct import unpack
-from exabgp.vendoring import six
+import six
from exabgp.bgp.message.update.attribute.bgpls.linkstate import LINKSTATE
diff -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/node/srcap.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/node/srcap.py
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/node/srcap.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/node/srcap.py 2025-03-15 14:26:19.788985910 -0400
@@ -9,7 +9,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/prefixmetric.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/prefixmetric.py
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/prefixmetric.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/prefixmetric.py 2025-03-15 14:26:19.795652562 -0400
@@ -8,7 +8,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/srprefix.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/srprefix.py
--- a/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/srprefix.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/bgpls/prefix/srprefix.py 2025-03-15 14:26:19.795652562 -0400
@@ -8,10 +8,10 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/mprnlri.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/mprnlri.py
--- a/lib/exabgp/bgp/message/update/attribute/mprnlri.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/mprnlri.py 2025-03-15 14:26:19.785652584 -0400
@@ -9,7 +9,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/sr/prefixsid.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/sr/prefixsid.py
--- a/lib/exabgp/bgp/message/update/attribute/sr/prefixsid.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/sr/prefixsid.py 2025-03-15 14:26:19.785652584 -0400
@@ -8,7 +8,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/sr/srgb.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/attribute/sr/srgb.py
--- a/lib/exabgp/bgp/message/update/attribute/sr/srgb.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/attribute/sr/srgb.py 2025-03-15 14:26:19.785652584 -0400
@@ -9,7 +9,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/nlri/bgpls/tlvs/ipreach.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/nlri/bgpls/tlvs/ipreach.py
--- a/lib/exabgp/bgp/message/update/nlri/bgpls/tlvs/ipreach.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/nlri/bgpls/tlvs/ipreach.py 2025-03-15 14:26:19.778985932 -0400
@@ -10,7 +10,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/bgp/message/update/nlri/vpls.py Aexabgp-4.2.24/lib/exabgp/bgp/message/update/nlri/vpls.py
--- a/lib/exabgp/bgp/message/update/nlri/vpls.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/bgp/message/update/nlri/vpls.py 2025-03-15 14:26:19.775652605 -0400
@@ -10,7 +10,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/configuration/configuration.py Aexabgp-4.2.24/lib/exabgp/configuration/configuration.py
--- a/lib/exabgp/configuration/configuration.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/configuration/configuration.py 2025-03-15 14:26:19.715652734 -0400
@@ -10,7 +10,7 @@
import os
import sys
-from exabgp.vendoring import six
+import six
from exabgp.logger import Logger
diff -u -r exabgp-4.2.24/lib/exabgp/configuration/core/scope.py Aexabgp-4.2.24/lib/exabgp/configuration/core/scope.py
--- a/lib/exabgp/configuration/core/scope.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/configuration/core/scope.py 2025-03-15 14:26:19.718986060 -0400
@@ -11,7 +11,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/configuration/core/tokeniser.py Aexabgp-4.2.24/lib/exabgp/configuration/core/tokeniser.py
--- a/lib/exabgp/configuration/core/tokeniser.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/configuration/core/tokeniser.py 2025-03-15 14:26:19.718986060 -0400
@@ -10,7 +10,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/configuration/environment.py Aexabgp-4.2.24/lib/exabgp/configuration/environment.py
--- a/lib/exabgp/configuration/environment.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/configuration/environment.py 2025-03-15 14:26:19.722319386 -0400
@@ -315,7 +315,7 @@
# ========================================================================= _env
#
-from exabgp.vendoring.six.moves import configparser as ConfigParser
+from six.moves import configparser as ConfigParser
from exabgp.util.hashtable import HashTable
diff -u -r exabgp-4.2.24/lib/exabgp/protocol/iso/__init__.py Aexabgp-4.2.24/lib/exabgp/protocol/iso/__init__.py
--- a/lib/exabgp/protocol/iso/__init__.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/protocol/iso/__init__.py 2025-03-15 14:26:19.765652627 -0400
@@ -10,7 +10,7 @@
# =========================================================================== ISO
#
-from exabgp.vendoring.bitstring import BitArray
+from bitstring import BitArray
class ISO(object):
diff -u -r exabgp-4.2.24/lib/exabgp/reactor/api/response/json.py Aexabgp-4.2.24/lib/exabgp/reactor/api/response/json.py
--- a/lib/exabgp/reactor/api/response/json.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/reactor/api/response/json.py 2025-03-15 14:26:19.738986017 -0400
@@ -14,7 +14,7 @@
import time
import signal
-from exabgp.vendoring import six
+import six
from exabgp.util import hexstring
diff -u -r exabgp-4.2.24/lib/exabgp/reactor/asynchronous.py Aexabgp-4.2.24/lib/exabgp/reactor/asynchronous.py
--- a/lib/exabgp/reactor/asynchronous.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/reactor/asynchronous.py 2025-03-15 14:26:19.735652691 -0400
@@ -10,7 +10,7 @@
from collections import deque
from exabgp.logger import Logger
-from exabgp.vendoring import six
+import six
class ASYNC(object):
diff -u -r exabgp-4.2.24/lib/exabgp/reactor/keepalive.py Aexabgp-4.2.24/lib/exabgp/reactor/keepalive.py
--- a/lib/exabgp/reactor/keepalive.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/reactor/keepalive.py 2025-03-15 14:26:19.735652691 -0400
@@ -6,7 +6,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/reactor/network/outgoing.py Aexabgp-4.2.24/lib/exabgp/reactor/network/outgoing.py
--- a/lib/exabgp/reactor/network/outgoing.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/reactor/network/outgoing.py 2025-03-15 14:26:19.732319365 -0400
@@ -1,6 +1,6 @@
import time
-from exabgp.vendoring import six
+import six
from exabgp.protocol.family import AFI
from .connection import Connection
diff -u -r exabgp-4.2.24/lib/exabgp/reactor/peer.py Aexabgp-4.2.24/lib/exabgp/reactor/peer.py
--- a/lib/exabgp/reactor/peer.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/reactor/peer.py 2025-03-15 14:26:19.735652691 -0400
@@ -11,7 +11,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/reactor/protocol.py Aexabgp-4.2.24/lib/exabgp/reactor/protocol.py
--- a/lib/exabgp/reactor/protocol.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/reactor/protocol.py 2025-03-15 14:26:19.745652670 -0400
@@ -9,7 +9,7 @@
import os
-from exabgp.vendoring import six
+import six
import traceback
# ================================================================ Registration
diff -u -r exabgp-4.2.24/lib/exabgp/rib/outgoing.py Aexabgp-4.2.24/lib/exabgp/rib/outgoing.py
--- a/lib/exabgp/rib/outgoing.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/rib/outgoing.py 2025-03-15 14:26:19.772319279 -0400
@@ -21,7 +21,7 @@
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 -u -r exabgp-4.2.24/lib/exabgp/util/coroutine.py Aexabgp-4.2.24/lib/exabgp/util/coroutine.py
--- a/lib/exabgp/util/coroutine.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/util/coroutine.py 2025-03-15 14:26:19.745652670 -0400
@@ -8,7 +8,7 @@
"""
from functools import wraps
-from exabgp.vendoring import six
+import six
def each(function):
diff -u -r exabgp-4.2.24/lib/exabgp/util/trace.py Aexabgp-4.2.24/lib/exabgp/util/trace.py
--- a/lib/exabgp/util/trace.py 2025-03-10 17:54:24.000000000 -0400
+++ b/lib/exabgp/util/trace.py 2025-03-15 14:26:19.745652670 -0400
@@ -9,7 +9,7 @@
import traceback
-from exabgp.vendoring.six.moves import StringIO
+from six.moves import StringIO
def trace():
diff -u -r exabgp-4.2.24/qa/tests/cache_test.py Aexabgp-4.2.24/qa/tests/cache_test.py
--- a/qa/tests/cache_test.py 2025-03-10 17:54:24.000000000 -0400
+++ b/qa/tests/cache_test.py 2025-03-15 14:26:19.708986082 -0400
@@ -12,9 +12,9 @@
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 -u -r exabgp-4.2.24/qa/tests/connection.py Aexabgp-4.2.24/qa/tests/connection.py
--- a/qa/tests/connection.py 2025-03-10 17:54:24.000000000 -0400
+++ b/qa/tests/connection.py 2025-03-15 14:26:19.708986082 -0400
@@ -15,7 +15,7 @@
import unittest
from exabgp.util.od import od
-from exabgp.vendoring import six
+import six
def test():
diff -u -r exabgp-4.2.24/qa/tests/protocol.py Aexabgp-4.2.24/qa/tests/protocol.py
--- a/qa/tests/protocol.py 2025-03-10 17:54:24.000000000 -0400
+++ b/qa/tests/protocol.py 2025-03-15 14:26:19.708986082 -0400
@@ -23,8 +23,8 @@
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 a new issue View git blame Copy permalink