applied the except and raise fixers to the master branch to close the gap with py3

[nepi.git] / src / nepi / resources / all / collector.py

diff --git a/src/nepi/resources/all/collector.py b/src/nepi/resources/all/collector.py
index 792e25f..4729e01 100644 (file)
--- a/src/nepi/resources/all/collector.py
+++ b/src/nepi/resources/all/collector.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -43,7 +42,7 @@ class Collector(ResourceManager):
     _help = "A Collector can be attached to a trace name on another " \
         "ResourceManager and will retrieve and store the trace content " \
         "in a local file at the end of the experiment"
-    _backend_type = "all"
+    _platform = "all"
 
     @classmethod
     def _register_attributes(cls):
@@ -78,7 +77,7 @@ class Collector(ResourceManager):
             
             msg = "No traceName was specified"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         self._store_path = self.ec.run_dir
 
@@ -113,13 +112,13 @@ class Collector(ResourceManager):
 
         rms = self.get_connected()
         for rm in rms:
-            result = self.ec.trace(rm.guid, trace_name)
             fpath = os.path.join(self.store_path, "%d.%s" % (rm.guid, 
-                rename))
+                 rename))
+
             try:
-                f = open(fpath, "w")
-                f.write(result)
-                f.close()
+                result = self.ec.trace(rm.guid, trace_name)
+                with open(fpath, "w") as f:
+                    f.write(result)
             except:
                 import traceback
                 err = traceback.format_exc()