clean up the use of globals in the samples -- some missing, many extr…

…aneous
JoelBender · Aug 26, 2016 · 17160db · 17160db
1 parent 2f8888f
commit 17160db
Show file tree

Hide file tree

Showing 28 changed files with 136 additions and 194 deletions.
diff --git a/samples/CommandableMixin.py b/samples/CommandableMixin.py
@@ -21,10 +21,6 @@
 _debug = 0
 _log = ModuleLogger(globals())
 
-# globals
-this_device = None
-this_application = None
-
 #
 #   CommandableMixin
 #

diff --git a/samples/ConsoleCmd.py b/samples/ConsoleCmd.py
@@ -63,4 +63,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
diff --git a/samples/MultiStateValueObject.py b/samples/MultiStateValueObject.py
@@ -17,10 +17,6 @@
 _debug = 0
 _log = ModuleLogger(globals())
 
-# globals
-this_device = None
-this_application = None
-
 #
 #   __main__
 #

diff --git a/samples/MultipleReadProperty.py b/samples/MultipleReadProperty.py
@@ -26,13 +26,7 @@
 _debug = 0
 _log = ModuleLogger(globals())
 
-# globals
-this_device = None
-this_application = None
-this_console = None
-
-# point list
-# set according to your device
+# point list, set according to your device
 point_list = [
     ('1.2.3.4', 'analogValue', 1, 'presentValue'),
     ('1.2.3.4', 'analogValue', 2, 'presentValue'),

diff --git a/samples/RandomAccumulatorObject.py b/samples/RandomAccumulatorObject.py
@@ -21,10 +21,6 @@
 _debug = 0
 _log = ModuleLogger(globals())
 
-# globals
-this_device = None
-this_application = None
-
 #
 #   RandomUnsignedValueProperty
 #

diff --git a/samples/RandomAnalogValueObject.py b/samples/RandomAnalogValueObject.py
@@ -28,10 +28,6 @@
 # settings
 RANDOM_OBJECT_COUNT = int(os.getenv('RANDOM_OBJECT_COUNT', 10))
 
-# globals
-this_device = None
-this_application = None
-
 #
 #   RandomValueProperty
 #
@@ -125,6 +121,5 @@ def main():
 
     _log.debug("fini")
 
-
 if __name__ == "__main__":
     main()
diff --git a/samples/ReadProperty.py b/samples/ReadProperty.py
@@ -27,7 +27,6 @@
 _log = ModuleLogger(globals())
 
 # globals
-this_device = None
 this_application = None
 this_console = None
 
@@ -151,7 +150,9 @@ def do_rtn(self, args):
 #   __main__
 #
 
-try:
+def main():
+    global this_application
+
     # parse the command line arguments
     args = ConfigArgumentParser(description=__doc__).parse_args()
 
@@ -189,7 +190,5 @@ def do_rtn(self, args):
 
     _log.debug("fini")
 
-except Exception as error:
-    _log.exception("an error has occurred: %s", error)
-finally:
-    _log.debug("finally")
+if __name__ == "__main__":
+    main()
diff --git a/samples/ReadPropertyAny.py b/samples/ReadPropertyAny.py
@@ -26,9 +26,7 @@
 _log = ModuleLogger(globals())
 
 # globals
-this_device = None
 this_application = None
-this_console = None
 
 #
 #   ReadPropertyAnyApplication
@@ -136,6 +134,8 @@ def do_read(self, args):
 #
 
 def main():
+    global this_application
+
     # parse the command line arguments
     args = ConfigArgumentParser(description=__doc__).parse_args()
 

diff --git a/samples/ReadPropertyMultiple.py b/samples/ReadPropertyMultiple.py
@@ -207,8 +207,7 @@ def do_read(self, args):
 
 def main():
     global this_application
-    global this_device
-    global this_console
+
     # parse the command line arguments
     args = ConfigArgumentParser(description=__doc__).parse_args()
 

diff --git a/samples/ReadPropertyMultipleServer.py b/samples/ReadPropertyMultipleServer.py
@@ -25,10 +25,6 @@
 _debug = 0
 _log = ModuleLogger(globals())
 
-# globals
-this_device = None
-this_application = None
-
 #
 #   RandomValueProperty
 #

diff --git a/samples/ReadRange.py b/samples/ReadRange.py
@@ -24,9 +24,7 @@
 _log = ModuleLogger(globals())
 
 # globals
-this_device = None
 this_application = None
-this_console = None
 
 #
 #   ReadRangeApplication
@@ -124,7 +122,9 @@ def do_readrange(self, args):
 #   __main__
 #
 
-try:
+def main():
+    global this_application
+
     # parse the command line arguments
     args = ConfigArgumentParser(description=__doc__).parse_args()
 
@@ -160,7 +160,7 @@ def do_readrange(self, args):
 
     run()
 
-except Exception as error:
-    _log.exception("an error has occurred: %s", error)
-finally:
-    _log.debug("finally")
+    _log.debug("fini")
+
+if __name__ == "__main__":
+    main()
diff --git a/samples/ReadWriteFile.py b/samples/ReadWriteFile.py
@@ -227,7 +227,9 @@ def do_writestream(self, args):
 #   __main__
 #
 
-try:
+def main():
+    global this_application
+
     # parse the command line arguments
     args = ConfigArgumentParser(description=__doc__).parse_args()
 
@@ -263,7 +265,7 @@ def do_writestream(self, args):
 
     run()
 
-except Exception as err:
-    _log.exception("an error has occurred: %s", err)
-finally:
-    _log.debug("finally")
+    _log.debug("fini")
+
+if __name__ == "__main__":
+    main()
diff --git a/samples/ReadWriteFileServer.py b/samples/ReadWriteFileServer.py
@@ -218,5 +218,7 @@ def main():
 
     run()
 
+    _log.debug("fini")
+
 if __name__ == "__main__":
     main()
diff --git a/samples/ReadWriteProperty.py b/samples/ReadWriteProperty.py
@@ -30,9 +30,7 @@
 _log = ModuleLogger(globals())
 
 # globals
-this_device = None
 this_application = None
-this_console = None
 
 #
 #   ReadPropertyApplication
@@ -234,7 +232,9 @@ def do_rtn(self, args):
 #   __main__
 #
 
-try:
+def main():
+    global this_application
+
     # parse the command line arguments
     args = ConfigArgumentParser(description=__doc__).parse_args()
 
@@ -270,7 +270,7 @@ def do_rtn(self, args):
 
     run()
 
-except Exception as error:
-    _log.exception("an error has occurred: %s", error)
-finally:
-    _log.debug("finally")
+    _log.debug("fini")
+
+if __name__ == "__main__":
+    main()
diff --git a/samples/RecurringMultipleReadProperty.py b/samples/RecurringMultipleReadProperty.py
@@ -27,11 +27,6 @@
 _debug = 0
 _log = ModuleLogger(globals())
 
-# globals
-this_device = None
-this_application = None
-this_console = None
-
 # point list
 point_list = [
     ('1.2.3.4', 'analogValue', 1, 'presentValue'),
@@ -150,7 +145,7 @@ def confirmation(self, apdu):
 #   __main__
 #
 
-try:
+def main():
     # parse the command line arguments
     parser = ConfigArgumentParser(description=__doc__)
 
@@ -176,6 +171,7 @@ def confirmation(self, apdu):
 
     # make a dog
     this_application = PrairieDog(args.interval, this_device, args.ini.address)
+    if _debug: _log.debug("    - this_application: %r", this_application)
 
     # get the services supported
     services_supported = this_application.get_services_supported()
@@ -188,7 +184,7 @@ def confirmation(self, apdu):
 
     run()
 
-except Exception as error:
-    _log.exception("an error has occurred: %s", error)
-finally:
-    _log.debug("finally")
+    _log.debug("fini")
+
+if __name__ == "__main__":
+    main()
diff --git a/samples/RecurringTask.py b/samples/RecurringTask.py
@@ -44,7 +44,7 @@ def process_task(self):
 #   __main__
 #
 
-try:
+def main():
     # parse the command line arguments
     parser = ArgumentParser(description=__doc__)
 
@@ -68,7 +68,7 @@ def process_task(self):
 
     run()
 
-except Exception as error:
-    _log.exception("an error has occurred: %s", error)
-finally:
-    _log.debug("finally")
+    _log.debug("fini")
+
+if __name__ == "__main__":
+    main()
diff --git a/samples/SampleApplication.py b/samples/SampleApplication.py
@@ -25,10 +25,6 @@
 _debug = 0
 _log = ModuleLogger(globals())
 
-# globals
-this_device = None
-this_application = None
-
 #
 #   SampleApplication
 #
@@ -61,7 +57,7 @@ def confirmation(self, apdu):
 #   __main__
 #
 
-try:
+def main():
     # parse the command line arguments
     args = ConfigArgumentParser(description=__doc__).parse_args()
 
@@ -93,8 +89,7 @@ def confirmation(self, apdu):
 
     run()
 
-except Exception as err:
-    _log.exception("an error has occurred: %s", err)
-finally:
-    _log.debug("finally")
+    _log.debug("fini")
 
+if __name__ == "__main__":
+    main()
diff --git a/samples/SampleConsoleCmd.py b/samples/SampleConsoleCmd.py
@@ -20,11 +20,6 @@
 _debug = 0
 _log = ModuleLogger(globals())
 
-# globals
-this_device = None
-this_application = None
-this_console = None
-
 #
 #   SampleApplication
 #
@@ -70,7 +65,7 @@ def do_nothing(self, args):
 #   __main__
 #
 
-try:
+def main():
     # parse the command line arguments
     args = ConfigArgumentParser(description=__doc__).parse_args()
 
@@ -106,8 +101,7 @@ def do_nothing(self, args):
 
     run()
 
-except Exception as error:
-    _log.exception("an error has occurred: %s", error)
-finally:
-    _log.debug("finally")
+    _log.debug("fini")
 
+if __name__ == "__main__":
+    main()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,4 +63,3 @@ def main():

		if __name__ == "__main__":
		main()
-Original file line number
+Diff line change
@@ Expand Up / @@ -218,5 +218,7 @@ def main(): @@
         run()
+        _log.debug("fini")
     if __name__ == "__main__":
         main()