Changeset 3922

Timestamp:

7 Feb 2009, 00:18:58 (16 years ago)

Author:

uli

Message:

Remove getId from facultycontainer: it overcomplicates things.

Location:

waeup/branches/ulif-rewrite/src/waeup

Files:

• interfaces.py (modified) (1 diff)
• university/facultycontainer.py (modified) (1 diff)

waeup/branches/ulif-rewrite/src/waeup/interfaces.py

@@ -41 +41 @@
     """A container for faculties.
     """
-    def getId(faculty):
-        """Get a unique id for a faculty.
-        """
-
     def addFaculty(faculty):
         """Add an IFactulty object.
+
+        Returns the key, under which the object was stored.
         """
     

waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py

@@ -16 +16 @@
     next_id = 0L
     
-    def getId(self, faculty):
-        """We need a unified id for each faculty, which acts as key.
-        """
-        return str(self.next_id)
-    
     def addFaculty(self, faculty):
         if not IFaculty.providedBy(faculty):
             raise TypeError('FacultyContainers contain only IFaculty instances')
-        id = self.getId(faculty)
+        id = str(self.next_id)
         self[id] = faculty
         while self.next_id in self.keys():