Merge pull request #134 from ChristianTremblay/release_19.4.28

Release 19.4.28

.gitignore

@@ -25,3 +25,7 @@ __pycache__
 /tests/need_rebuild_Device.py
 /tests/.coverage
 /pylintrc
+/.pytest_cache
+/tests/archive
+/BAC0/web/test
+/venv/

BAC0/__init__.py

@@ -5,10 +5,12 @@
     import bacpypes
 except ImportError:
     # Using print here or setup.py will fail
-    print('='*80)
-    print('bacpypes module missing, please install latest version using \n    $ "pip install bacpypes"')
-    print('\nDiscard this message if you are actually installing BAC0.')
-    print('='*80)
+    print("=" * 80)
+    print(
+        'bacpypes module missing, please install latest version using \n    $ "pip install bacpypes"'
+    )
+    print("\nDiscard this message if you are actually installing BAC0.")
+    print("=" * 80)
 
 try:
     from . import core
@@ -21,28 +23,34 @@
     from .tasks.Match import Match as match
     from .core.utils.notes import update_log_level as log_level
     from .infos import __version__ as version
-    
+
     # To be able to use the complete version pandas, flask and bokeh must be installed.
     try:
         import pandas
         import bokeh
         import flask
         import flask_bootstrap
+
         _COMPLETE = True
     except ImportError:
         _COMPLETE = False
-    
+
     if _COMPLETE:
         from .scripts.Complete import Complete as connect
         from .scripts.Lite import Lite as lite
     else:
         from .scripts.Lite import Lite as connect
+
         lite = connect
-        #print('All features not available as some modules are missing (flask, flask-bootstrap, bokeh, pandas). See docs for details')
+        # print('All features not available as some modules are missing (flask, flask-bootstrap, bokeh, pandas). See docs for details')
 
-except ImportError as err:
-    print('='*80)
-    print('Import Error, refer to documentation or reinstall using \n    $ "pip install BAC0"')
-    print('\nDiscard this message if you are actually installing BAC0.')
-    print('='*80)
+except ImportError as error:
+    print("=" * 80)
+    print(
+        'Import Error, refer to documentation or reinstall using \n    $ "pip install BAC0"\n {}'.format(
+            error
+        )
+    )
+    print("\nDiscard this message if you are actually installing BAC0.")
+    print("=" * 80)
     # Probably installing the app...

BAC0/core/app/ScriptApplication.py

@@ -4,7 +4,7 @@
 # Copyright (C) 2015 by Christian Tremblay, P.Eng <[email protected]>
 # Licensed under LGPLv3, see file LICENSE in this source tree.
 #
-'''
+"""
 SimpleApplication 
 =================
 
@@ -15,19 +15,19 @@
 Additional functionality is enabled by inheriting this application, and then 
 extending it with more functions. [See BAC0.scripts for more examples of this.]
 
-'''
-#--- standard Python modules ---
+"""
+# --- standard Python modules ---
 from collections import defaultdict
 
-#--- 3rd party modules ---
+# --- 3rd party modules ---
 from bacpypes.app import BIPSimpleApplication, BIPForeignApplication
 from bacpypes.pdu import Address
 from bacpypes.service.object import ReadWritePropertyMultipleServices
 
-#--- this application's modules ---
+# --- this application's modules ---
 from ..utils.notes import note_and_log
 
-#------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 
 
 @note_and_log
@@ -43,7 +43,10 @@ class SimpleApplication(BIPSimpleApplication, ReadWritePropertyMultipleServices)
     def __init__(self, *args, bbmdAddress=None, bbmdTTL=0):
         self.localAddress = None
 
-        super().__init__(*args)
+        try:
+            super().__init__(*args)
+        except OSError:
+            raise
 
         self._request = None
 
@@ -54,17 +57,19 @@ def __init__(self, *args, bbmdAddress=None, bbmdTTL=0):
             self.local_unicast_tuple = self.localAddress.addrTuple
             self.local_broadcast_tuple = self.localAddress.addrBroadcastTuple
         else:
-            self.local_unicast_tuple = ('', 47808)
-            self.local_broadcast_tuple = ('255.255.255.255', 47808)
+            self.local_unicast_tuple = ("", 47808)
+            self.local_broadcast_tuple = ("255.255.255.255", 47808)
 
     def do_WhoIsRequest(self, apdu):
         """Respond to a Who-Is request."""
         self.log(("do_WhoIsRequest {!r}".format(apdu)))
 
         # build a key from the source and parameters
-        key = (str(apdu.pduSource),
-               apdu.deviceInstanceRangeLowLimit,
-               apdu.deviceInstanceRangeHighLimit)
+        key = (
+            str(apdu.pduSource),
+            apdu.deviceInstanceRangeLowLimit,
+            apdu.deviceInstanceRangeHighLimit,
+        )
 
         # count the times this has been received
         self.who_is_counter[key] += 1
@@ -85,7 +90,9 @@ def do_IAmRequest(self, apdu):
 
 
 @note_and_log
-class ForeignDeviceApplication(BIPForeignApplication, ReadWritePropertyMultipleServices):
+class ForeignDeviceApplication(
+    BIPForeignApplication, ReadWritePropertyMultipleServices
+):
     """
     Defines a basic BACnet/IP application to process BACnet requests.
 
@@ -97,7 +104,10 @@ class ForeignDeviceApplication(BIPForeignApplication, ReadWritePropertyMultipleS
     def __init__(self, *args, bbmdAddress=None, bbmdTTL=0):
         self.localAddress = None
 
-        super().__init__(*args, bbmdAddress=bbmdAddress, bbmdTTL=bbmdTTL)
+        try:
+            super().__init__(*args, bbmdAddress=bbmdAddress, bbmdTTL=bbmdTTL)
+        except OSError:
+            raise
 
         self._request = None
 
@@ -108,17 +118,19 @@ def __init__(self, *args, bbmdAddress=None, bbmdTTL=0):
             self.local_unicast_tuple = self.localAddress.addrTuple
             self.local_broadcast_tuple = self.localAddress.addrBroadcastTuple
         else:
-            self.local_unicast_tuple = ('', 47808)
-            self.local_broadcast_tuple = ('255.255.255.255', 47808)
+            self.local_unicast_tuple = ("", 47808)
+            self.local_broadcast_tuple = ("255.255.255.255", 47808)
 
     def do_WhoIsRequest(self, apdu):
         """Respond to a Who-Is request."""
         self.log(("do_WhoIsRequest {!r}".format(apdu)))
 
         # build a key from the source and parameters
-        key = (str(apdu.pduSource),
-               apdu.deviceInstanceRangeLowLimit,
-               apdu.deviceInstanceRangeHighLimit)
+        key = (
+            str(apdu.pduSource),
+            apdu.deviceInstanceRangeLowLimit,
+            apdu.deviceInstanceRangeHighLimit,
+        )
 
         # count the times this has been received
         self.who_is_counter[key] += 1

BAC0/core/app/__init__.py

@@ -1,3 +1,3 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-from . import ScriptApplication
+from . import ScriptApplication