Fix more Python 3 issues

(cherry picked from commit 6a0c334)

Author: peternewman

python/examples/ola_candidate_ports.py

@@ -25,6 +25,8 @@
 
 __author__ = 'simon.marchi@polymtl.ca (Simon Marchi)'
 
+wrapper = None
+
 
 def ParseArgs():
   desc = 'Show the candidate ports to patch to a universe.'
@@ -52,11 +54,21 @@ def GetCandidatePortsCallback(status, devices):
   else:
     print('Error: %s' % status.message, file=sys.stderr)
 
+  global wrapper
+  if wrapper:
+    wrapper.Stop()
+
+
+def main():
+  args = ParseArgs()
+  universe = args.universe
+
+  global wrapper
+  wrapper = ClientWrapper()
+  client = wrapper.Client()
+  client.GetCandidatePorts(GetCandidatePortsCallback, universe)
+  wrapper.Run()
 
-args = ParseArgs()
-universe = args.universe
 
-wrapper = ClientWrapper()
-client = wrapper.Client()
-client.GetCandidatePorts(GetCandidatePortsCallback, universe)
-wrapper.Run()
+if __name__ == "__main__":
+  main()

python/examples/ola_devices.py

@@ -57,3 +57,7 @@ def main():
   client = wrapper.Client()
   client.FetchDevices(Devices)
   wrapper.Run()
+
+
+if __name__ == "__main__":
+  main()

tools/rdm/ModelCollector.py

@@ -103,7 +103,7 @@ def _GetDevice(self):
   def _GetVersion(self):
     this_device = self._GetDevice()
     software_versions = this_device['software_versions']
-    return software_versions[software_versions.keys()[0]]
+    return software_versions[list(software_versions.keys())[0]]
 
   def _GetCurrentPersonality(self):
     this_device = self._GetDevice()

tools/rdm/TestDefinitions.py

@@ -3264,7 +3264,7 @@ class SetLampOnMode(TestMixins.SetMixin, OptionalParameterTestFixture):
   EXPECTED_FIELDS = ['mode']
   REQUIRES = ['lamp_on_mode']
   ALLOWED_MODES = [0, 1, 2]
-  ALL_MODES = ALLOWED_MODES + [3] + range(0x80, 0xe0)
+  ALL_MODES = ALLOWED_MODES + [3] + list(range(0x80, 0xe0))
 
   def OldValue(self):
     old = self.Property('lamp_on_mode')