Changeset 13165 for main

Timestamp:

13 Jul 2015, 07:53:26 (9 years ago)

Author:

Henrik Bettermann

Message:

Remove non-implemented methods.

Add methods to hostel section interfaces.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• hostels/container.py (modified) (1 diff)
• hostels/interfaces.py (modified) (3 diffs)
• hostels/tests.py (modified) (1 diff)
• students/container.py (modified) (1 diff)
• students/interfaces.py (modified) (1 diff)
• students/tests/test_container.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/hostels/container.py

@@ -35 +35 @@
         super(HostelsContainer, self).__init__()
         return
-
-    def archive(self, id=None):
-        raise NotImplementedError()
-
-    def clear(self, id=None, archive=True):
-        raise NotImplementedError()
 
     def addHostel(self, hostel):

main/waeup.kofa/trunk/src/waeup/kofa/hostels/interfaces.py

@@ -31 +31 @@
 class IHostelsContainer(IKofaObject):
     """A container for all kind of hostel objects.
-
     """
+
+    expired = Attribute('True if current datetime is in application period.')
 
     startdate = schema.Datetime(
@@ -66 +67 @@
         """
 
+    def addHostel(hostel):
+        """Add a hostel.
+        """
+
+    def logger_info(ob_class, target, comment=None):
+        """Get the logger's info method.
+        """
+
 class IHostel(IKofaObject):
     """A base representation of hostels.
-
     """
 
@@ -205 +213 @@
 class IBed(IKofaObject):
     """A base representation of beds.
-
     """
 

main/waeup.kofa/trunk/src/waeup/kofa/hostels/tests.py

@@ -87 +87 @@
         container = HostelsContainer()
         hostel = Hostel()
-        self.assertRaises(
-            NotImplementedError, container.archive)
-        self.assertRaises(
-            NotImplementedError, container.clear)
         # We cannot add arbitrary objects
         department = Department()

main/waeup.kofa/trunk/src/waeup/kofa/students/container.py

@@ -65 +65 @@
         return new_id
 
-    def archive(self, id=None):
-        raise NotImplementedError()
-
-    def clear(self, id=None, archive=True):
-        raise NotImplementedError()
-
     def addStudent(self, student):
         """Add a student with subcontainers.

main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

@@ -145 +145 @@
         """
 
-    def archive(id=None):
-        """Create on-dist archive of students.
-
-        If id is `None`, all students are archived.
-
-        If id contains a single id string, only the respective
-        students are archived.
-
-        If id contains a list of id strings all of the respective
-        students types are saved to disk.
-        """
-
-    def clear(id=None, archive=True):
-        """Remove students of type given by 'id'.
-
-        Optionally archive the students.
-
-        If id is `None`, all students are archived.
-
-        If id contains a single id string, only the respective
-        students are archived.
-
-        If id contains a list of id strings all of the respective
-        student types are saved to disk.
-
-        If `archive` is ``False`` none of the archive-handling is done
-        and respective students are simply removed from the
-        database.
-        """
-
     unique_student_id = Attribute("""A unique student id.""")
 

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_container.py

@@ -72 +72 @@
         # We cannot call the fundamental methods of a base in that case
         container = StudentsContainer()
-        self.assertRaises(
-            NotImplementedError, container.archive)
-        self.assertRaises(
-            NotImplementedError, container.clear)
         # We cannot add arbitrary objects
         department = Department()