diff --git a/CHANGES.txt b/CHANGES.txt index 48b2b170..02b686fc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,9 +10,13 @@ Revision 5.0.0, released 2018-07-?? PyCryptodomex to pyca/cryptography whenever available on the platform. - Many really old backward-compatibility code snippets removed. - Most importantly, the `pysnmp.entity.rfc3413.oneliner` and - everything related to (non-standard) UNIX domain socket transport - are gone. + Most importantly: + + * `pysnmp.entity.rfc3413.oneliner` and everything related + to the (non-standard) UNIX domain socket transport is gone + * `pysnmp.carrier.asynsock` backward-compatible wrapper over + `pysnmp.carrier.asyncore` is gone + - The MIB instrumentation API overhauled in backward incompatible way: diff --git a/examples/v1arch/asyncore/agent/ntforg/send-inform-over-ipv4-and-ipv6.py b/examples/v1arch/asyncore/agent/ntforg/send-inform-over-ipv4-and-ipv6.py index efa8151d..69d9b43b 100644 --- a/examples/v1arch/asyncore/agent/ntforg/send-inform-over-ipv4-and-ipv6.py +++ b/examples/v1arch/asyncore/agent/ntforg/send-inform-over-ipv4-and-ipv6.py @@ -18,8 +18,8 @@ The following Net-SNMP command will produce similar SNMP notification: """# from time import time -from pysnmp.carrier.asynsock.dispatch import AsynsockDispatcher -from pysnmp.carrier.asynsock.dgram import udp, udp6 +from pysnmp.carrier.asyncore.dispatch import AsyncoreDispatcher +from pysnmp.carrier.asyncore.dgram import udp, udp6 from pyasn1.codec.ber import encoder, decoder from pysnmp.proto.api import v2c as pMod @@ -61,7 +61,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, return wholeMsg -transportDispatcher = AsynsockDispatcher() +transportDispatcher = AsyncoreDispatcher() transportDispatcher.registerRecvCbFun(cbRecvFun) transportDispatcher.registerTimerCbFun(cbTimerFun) diff --git a/pysnmp/carrier/asynsock/__init__.py b/pysnmp/carrier/asynsock/__init__.py deleted file mode 100644 index 8c3066b2..00000000 --- a/pysnmp/carrier/asynsock/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# This file is necessary to make this directory a package. diff --git a/pysnmp/carrier/asynsock/dgram/__init__.py b/pysnmp/carrier/asynsock/dgram/__init__.py deleted file mode 100644 index 8c3066b2..00000000 --- a/pysnmp/carrier/asynsock/dgram/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# This file is necessary to make this directory a package. diff --git a/pysnmp/carrier/asynsock/dgram/udp.py b/pysnmp/carrier/asynsock/dgram/udp.py deleted file mode 100644 index c77184de..00000000 --- a/pysnmp/carrier/asynsock/dgram/udp.py +++ /dev/null @@ -1,7 +0,0 @@ -# -# This file is part of pysnmp software. -# -# Copyright (c) 2005-2018, Ilya Etingof -# License: http://snmplabs.com/pysnmp/license.html -# -from pysnmp.carrier.asyncore.dgram.udp import * diff --git a/pysnmp/carrier/asynsock/dgram/udp6.py b/pysnmp/carrier/asynsock/dgram/udp6.py deleted file mode 100644 index 7ac4c555..00000000 --- a/pysnmp/carrier/asynsock/dgram/udp6.py +++ /dev/null @@ -1,7 +0,0 @@ -# -# This file is part of pysnmp software. -# -# Copyright (c) 2005-2018, Ilya Etingof -# License: http://snmplabs.com/pysnmp/license.html -# -from pysnmp.carrier.asyncore.dgram.udp6 import * diff --git a/pysnmp/carrier/asynsock/dispatch.py b/pysnmp/carrier/asynsock/dispatch.py deleted file mode 100644 index 120a9a70..00000000 --- a/pysnmp/carrier/asynsock/dispatch.py +++ /dev/null @@ -1,9 +0,0 @@ -# -# This file is part of pysnmp software. -# -# Copyright (c) 2005-2018, Ilya Etingof -# License: http://snmplabs.com/pysnmp/license.html -# -from pysnmp.carrier.asyncore.dispatch import * - -AsynsockDispatcher = AsyncoreDispatcher diff --git a/setup.py b/setup.py index 9f5231b1..30fc8d49 100644 --- a/setup.py +++ b/setup.py @@ -100,8 +100,6 @@ params.update({ 'pysnmp.smi.mibs', 'pysnmp.smi.mibs.instances', 'pysnmp.carrier', - 'pysnmp.carrier.asynsock', - 'pysnmp.carrier.asynsock.dgram', 'pysnmp.carrier.asyncore', 'pysnmp.carrier.asyncore.dgram', 'pysnmp.carrier.twisted',