diff --git a/py27/bacpypes/appservice.py b/py27/bacpypes/appservice.py index 87849b7..2a2dd9d 100755 --- a/py27/bacpypes/appservice.py +++ b/py27/bacpypes/appservice.py @@ -11,7 +11,7 @@ from .debugging import ModuleLogger, DebugContents, bacpypes_debugging from .comm import Client, ServiceAccessPoint, ApplicationServiceElement from .task import OneShotTask -from .pdu import Address, LocalStation, RemoteStation +from .pdu import Address from .apdu import AbortPDU, AbortReason, ComplexAckPDU, \ ConfirmedRequestPDU, Error, ErrorPDU, RejectPDU, SegmentAckPDU, \ SimpleAckPDU, UnconfirmedRequestPDU, apdu_types, \ @@ -1247,7 +1247,7 @@ class StateMachineAccessPoint(Client, ServiceAccessPoint): elif self.dccEnableDisable == 'disableInitiation': if _debug: StateMachineAccessPoint._debug(" - initiation disabled") - if (pdu.apduType == 1) and (pdu.apduService == 0): + if (apdu.apduType == 1) and (apdu.apduService == 0): if _debug: StateMachineAccessPoint._debug(" - continue with I-Am") else: if _debug: StateMachineAccessPoint._debug(" - not an I-Am") diff --git a/py27/bacpypes/service/device.py b/py27/bacpypes/service/device.py index 6c2878e..e7faf94 100644 --- a/py27/bacpypes/service/device.py +++ b/py27/bacpypes/service/device.py @@ -14,8 +14,6 @@ from ..object import register_object_type, registered_object_types, \ Property, DeviceObject from ..task import FunctionTask -from ..basetypes import ErrorClass, ErrorCode - # some debugging _debug = 0 _log = ModuleLogger(globals())