python3 - 2to3 + miscell obvious tweaks

[sfa.git] / sfa / util / enumeration.py

diff --git a/sfa/util/enumeration.py b/sfa/util/enumeration.py
index 4e508bd..6e6d3c3 100644 (file)
--- a/sfa/util/enumeration.py
+++ b/sfa/util/enumeration.py
@@ -1,13 +1,37 @@
+#----------------------------------------------------------------------
+# Copyright (c) 2008 Board of Trustees, Princeton University
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and/or hardware specification (the "Work") to
+# deal in the Work without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Work, and to permit persons to whom the Work
+# is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Work.
+#
+# THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS
+# IN THE WORK.
+#----------------------------------------------------------------------
+
 
 class Enum(set):
+
     def __init__(self, *args, **kwds):
         set.__init__(self)
-        enums = dict(zip(args, [object() for i in range(len(args))]), **kwds)
-        for (key, value) in enums.items():
+        enums = dict(list(zip(args, [object() for i in range(len(args))])), **kwds)
+        for (key, value) in list(enums.items()):
             setattr(self, key, value)
             self.add(eval('self.%s' % key))
 
 
-#def Enum2(*args, **kwds):
+# def Enum2(*args, **kwds):
 #    enums = dict(zip(sequential, range(len(sequential))), **named)
 #    return type('Enum', (), enums)