Changeset 5005

Timestamp:

4 Feb 2010, 11:54:20 (15 years ago)

Author:

uli

Message:

Fix references to academics stuff interfaces. This is the first step to make academics stuff pluggable.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/breadcrumbs.py (modified) (1 diff)
• browser/interfaces.py (modified) (1 diff)
• browser/pages.py (modified) (1 diff)
• browser/viewlets.py (modified) (1 diff)
• catalog.py (modified) (1 diff)
• tables.py (modified) (1 diff)
• university/certificate.py (modified) (1 diff)
• university/certificate.txt (modified) (2 diffs)
• university/certificatecontainer.py (modified) (1 diff)
• university/certificatecontainer.txt (modified) (1 diff)
• university/course.py (modified) (1 diff)
• university/course.txt (modified) (1 diff)
• university/coursecontainer.py (modified) (1 diff)
• university/coursecontainer.txt (modified) (1 diff)
• university/department.py (modified) (1 diff)
• university/department.txt (modified) (1 diff)
• university/faculty.py (modified) (1 diff)
• university/faculty.txt (modified) (2 diffs)
• university/facultycontainer.py (modified) (1 diff)
• university/facultycontainer.txt (modified) (2 diffs)
• utils/batching.py (modified) (1 diff)
• utils/converters.txt (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/browser/breadcrumbs.py

@@ -6 +6 @@
 from zope.publisher.browser import TestRequest
 
-from waeup.sirp import interfaces
+from waeup.sirp.browser import interfaces
 from waeup.sirp.browser.interfaces import (IBreadcrumb, IBreadcrumbIgnorable,
                                       IBreadcrumbContainer)

main/waeup.sirp/trunk/src/waeup/sirp/browser/interfaces.py

@@ -3 +3 @@
 from zope import schema
 from zope.interface import Interface, Attribute
-
+from waeup.sirp.interfaces import (
+    IWAeUPObject, IUniversity, IUserContainer, IDataCenter)
+from waeup.sirp.university.interfaces import (
+    IFacultyContainer, IFaculty, IDepartment, ICourseContainer, ICourse,
+    ICertificateContainer, ICertificate, ICertificateCourse)
 
 class IBreadcrumb(Interface):

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -10 +10 @@
 from hurry import yui
 from hurry.workflow.interfaces import NoTransitionAvailableError
-from waeup.sirp.browser import (WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage,
-                           WAeUPDisplayFormPage, NullValidator)
+from waeup.sirp.browser import (
+    WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage,
+    WAeUPDisplayFormPage, NullValidator)
+from waeup.sirp.browser.interfaces import (
+    IUniversity, IFacultyContainer, IFaculty, IDepartment, ICourse,
+    ICertificate, ICertificateCourse)
 from waeup.sirp.catalog import search, search_context
-from waeup.sirp.interfaces import (IUniversity, IWAeUPObject, IUserContainer,
-                              IUserAccount, IFacultyContainer, IDataCenter,
-                              IFaculty, IDepartment, ICourse, ICertificate,
-                              ICertificateCourse, IWAeUPXMLImporter,
-                              IWAeUPXMLExporter)
+from waeup.sirp.interfaces import(
+    IWAeUPObject, IUserContainer, IUserAccount, IDataCenter,
+    IWAeUPXMLImporter, IWAeUPXMLExporter)
 from waeup.sirp.widgets.interfaces import ITableProvider
 from waeup.sirp.utils.helpers import getName
 from zope import schema
-from zope.app.security.interfaces import (IAuthentication,
-                                          IUnauthenticatedPrincipal,
-                                          ILogout)
+from zope.app.security.interfaces import (
+    IAuthentication, IUnauthenticatedPrincipal, ILogout)
 from zope.component import getUtility, createObject
 from zope.component.interfaces import Invalid

main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py

@@ -6 +6 @@
 from zope.component import getMultiAdapter
 from zope.location.interfaces import ISite
-from waeup.sirp.browser.pages import (UniversityPage, FacultyContainerPage,
-                                 DatacenterPage, FacultyPage, DepartmentPage,
-                                 CoursePage, CertificatePage,
-                                 CertificateCoursePage)
-from waeup.sirp.browser.interfaces import IBreadcrumbContainer
-from waeup.sirp.interfaces import (IUniversity, IWAeUPObject, IWAeUPXMLExporter,
-                              IWAeUPXMLImporter, IFacultyContainer, IFaculty,
-                              IDepartment, ICourse, ICertificate,
-                              ICertificateCourse, IDataCenter)
+from waeup.sirp.browser.pages import (
+    UniversityPage, FacultyContainerPage, DatacenterPage, FacultyPage,
+    DepartmentPage, CoursePage, CertificatePage, CertificateCoursePage)
+from waeup.sirp.browser.interfaces import (
+    IFacultyContainer, IFaculty, IDepartment, ICourse, ICertificate,
+    ICertificateCourse, IBreadcrumbContainer, IUniversity)
+from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPXMLExporter,
+                                   IWAeUPXMLImporter, IDataCenter)
 
 grok.templatedir('templates')

main/waeup.sirp/trunk/src/waeup/sirp/catalog.py

@@ -5 +5 @@
 from hurry.query import Eq
 from waeup.sirp.app import University
-from waeup.sirp.interfaces import ICourse, ICertificateCourse
+from waeup.sirp.university.interfaces import ICourse, ICertificateCourse
 from waeup.sirp.student.interfaces import IStudent
 from zope.app.catalog.interfaces import ICatalog

main/waeup.sirp/trunk/src/waeup/sirp/tables.py

@@ -2 +2 @@
 """
 import grok
-from waeup.sirp.interfaces import (IUniversity, IFacultyContainer, IFaculty,
-                              IDepartment, ICourseContainer)
+from waeup.sirp.interfaces import IUniversity
+from waeup.sirp.university.interfaces import (
+    IFacultyContainer, IFaculty, IDepartment, ICourseContainer)
 from waeup.sirp.widgets.interfaces import ITableProvider
 from waeup.sirp.widgets.table import YUITable as Table

main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py

@@ -7 +7 @@
 from zope.component.interfaces import IFactory, ComponentLookupError
 from zope.interface import implementedBy
-from waeup.sirp.interfaces import ICertificate, ICertificateCourse, ICourse
+from waeup.sirp.university.interfaces import (
+    ICertificate, ICertificateCourse, ICourse)
 
 class Certificate(grok.Container):

main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.txt

@@ -36 +36 @@
    Certificates have the attributes required by the `ICertificate` interface:
 
-     >>> from waeup.sirp.interfaces import ICertificate
+     >>> from waeup.sirp.university.interfaces import ICertificate
      >>> ICertificate.providedBy(mycertificate)
      True
@@ -323 +323 @@
 :class:`ICertificateCourse` interface:
 
-    >>> from waeup.sirp.interfaces import ICertificateCourse
+    >>> from waeup.sirp.university.interfaces import ICertificateCourse
     >>> from waeup.sirp.university.certificate import CertificateCourse
     >>> mycertcourse = CertificateCourse(None, 200, False)

main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.py

@@ -2 +2 @@
 """
 import grok
-from waeup.sirp.interfaces import ICertificateContainer, ICertificate
+from waeup.sirp.university.interfaces import (
+    ICertificateContainer, ICertificate)
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy

main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.txt

@@ -41 +41 @@
    Certificate containers provide `ICertificateContainer`:
 
-     >>> from waeup.sirp.interfaces import ICertificateContainer
+     >>> from waeup.sirp.university.interfaces import ICertificateContainer
      >>> ICertificateContainer.providedBy(mycontainer)
      True

main/waeup.sirp/trunk/src/waeup/sirp/university/course.py

@@ -4 +4 @@
 from zope.interface import implementedBy
 from zope.component.interfaces import IFactory
-from waeup.sirp.interfaces import ICourse
+from waeup.sirp.university.interfaces import ICourse
 
 class Course(grok.Model):

main/waeup.sirp/trunk/src/waeup/sirp/university/course.txt

@@ -38 +38 @@
    :class:`waeup.sirp.interfaces.ICourse` interface:
 
-     >>> from waeup.sirp.interfaces import ICourse
+     >>> from waeup.sirp.university.interfaces import ICourse
      >>> ICourse.providedBy(mycourse)
      True

main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.py

@@ -4 +4 @@
 from zope.interface import implementedBy
 from zope.component.interfaces import IFactory
-from waeup.sirp.interfaces import ICourseContainer, ICourse
+from waeup.sirp.university.interfaces import ICourseContainer, ICourse
 
 class CourseContainer(grok.Container):

main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.txt

@@ -41 +41 @@
    Course containers provide `ICourseContainer`:
 
-     >>> from waeup.sirp.interfaces import ICourseContainer
+     >>> from waeup.sirp.university.interfaces import ICourseContainer
      >>> ICourseContainer.providedBy(mycontainer)
      True

main/waeup.sirp/trunk/src/waeup/sirp/university/department.py

@@ -5 +5 @@
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
-from waeup.sirp.interfaces import IDepartment
+from waeup.sirp.university.interfaces import IDepartment
 
 class Department(grok.Container):

main/waeup.sirp/trunk/src/waeup/sirp/university/department.txt

@@ -43 +43 @@
    `IDepartment` interface:
 
-     >>> from waeup.sirp.interfaces import IDepartment
+     >>> from waeup.sirp.university.interfaces import IDepartment
      >>> IDepartment.providedBy(mydept)
      True

main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py

@@ -5 +5 @@
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
-from waeup.sirp.interfaces import IFaculty, IDepartment
+from waeup.sirp.university.interfaces import IFaculty, IDepartment
 
 class Faculty(grok.Container):

main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.txt

@@ -42 +42 @@
    `IFaculty` interface:
 
-     >>> from waeup.sirp.interfaces import IFaculty
+     >>> from waeup.sirp.university.interfaces import IFaculty
      >>> IFaculty.providedBy(myfac)
      True
@@ -175 +175 @@
 Faculties have the attributes required by the `IFaculty` interface:
 
-    >>> from waeup.sirp.interfaces import IFaculty
+    >>> from waeup.sirp.university.interfaces import IFaculty
     >>> IFaculty.providedBy(myfaculty)
     True

main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.py

@@ -2 +2 @@
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
-from waeup.sirp.interfaces import IFacultyContainer, IFaculty
+from waeup.sirp.university.interfaces import IFacultyContainer, IFaculty
 
 class FacultyContainer(grok.Container):

main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.txt

@@ -43 +43 @@
    `IFacultyContainer` interface:
 
-     >>> from waeup.sirp.interfaces import IFacultyContainer
+     >>> from waeup.sirp.university.interfaces import IFacultyContainer
      >>> IFacultyContainer.providedBy(mycontainer)
      True
@@ -129 +129 @@
 Faculty containers provide `IFacultyContainer`:
 
-    >>> from waeup.sirp.interfaces import IFacultyContainer
+    >>> from waeup.sirp.university.interfaces import IFacultyContainer
     >>> IFacultyContainer.providedBy(mycontainer)
     True

main/waeup.sirp/trunk/src/waeup/sirp/utils/batching.py

@@ -15 +15 @@
 from zope.schema import getFields
 from zope.schema.interfaces import IText
-from waeup.sirp.interfaces import (IBatchProcessor, IFacultyContainer, IFaculty,
-                              ICourse, IDepartment, ICertificate,
-                              ICertificateCourse, ISchemaTypeConverter,
-                              FatalCSVError)
+from waeup.sirp.interfaces import (
+    IBatchProcessor, ISchemaTypeConverter, FatalCSVError)
+from waeup.sirp.university.interfaces import (
+    IFacultyContainer, IFaculty, ICourse, IDepartment, ICertificate,
+    ICertificateCourse)
 
 class BatchProcessor(grok.GlobalUtility):

main/waeup.sirp/trunk/src/waeup/sirp/utils/converters.txt

@@ -668 +668 @@
     '1'
 
-    >>> from waeup.sirp.interfaces import ICourse
+    >>> from waeup.sirp.university.interfaces import ICourse
     >>> from zope.schema import getFields
     >>> field = getFields(ICourse)['semester']