Changeset 4796


Ignore:
Timestamp:
11 Jan 2010, 22:53:20 (15 years ago)
Author:
uli
Message:

Fix all imports.

Location:
waeup/branches/ulif-namespace/src/waeup/sirp
Files:
32 edited

Legend:

Unmodified
Added
Removed
  • waeup/branches/ulif-namespace/src/waeup/sirp/__init__.py

    r4789 r4796  
    11import grok
    2 from waeup.interfaces import IWAeUPObject
     2from waeup.sirp.interfaces import IWAeUPObject
    33from zope.annotation.attribute import AttributeAnnotations
    44from zope.annotation.interfaces import IAnnotations
  • waeup/branches/ulif-namespace/src/waeup/sirp/app.py

    r4789 r4796  
    44from zope.component import createObject
    55
    6 from waeup.interfaces import IUniversity, ICSVDataReceivers
    7 from waeup.authentication import setup_authentication
    8 from waeup.datacenter import DataCenter
    9 from waeup.users import UserContainer
     6from waeup.sirp.interfaces import IUniversity, ICSVDataReceivers
     7from waeup.sirp.authentication import setup_authentication
     8from waeup.sirp.datacenter import DataCenter
     9from waeup.sirp.users import UserContainer
    1010
    1111class University(grok.Application, grok.Container):
  • waeup/branches/ulif-namespace/src/waeup/sirp/authentication.py

    r4789 r4796  
    1010from zope.securitypolicy.interfaces import IPrincipalRoleManager
    1111from zope.securitypolicy.principalrole import principalRoleManager
    12 from waeup.interfaces import IUserAccount
    13 import waeup.permissions
     12from waeup.sirp.interfaces import IUserAccount
     13import waeup.sirp.permissions
    1414
    1515def setup_authentication(pau):
  • waeup/branches/ulif-namespace/src/waeup/sirp/browser/__init__.py

    r4789 r4796  
    1 from waeup.browser.layout import (WAeUPPage, WAeUPLayout, WAeUPDisplayFormPage,
    2                                   WAeUPEditFormPage, WAeUPAddFormPage,
    3                                   NullValidator)
     1from waeup.sirp.browser.layout import (
     2    WAeUPPage, WAeUPLayout, WAeUPDisplayFormPage, WAeUPEditFormPage,
     3    WAeUPAddFormPage, NullValidator)
  • waeup/branches/ulif-namespace/src/waeup/sirp/browser/breadcrumbs.py

    r4789 r4796  
    66from zope.publisher.browser import TestRequest
    77
    8 from waeup import interfaces
    9 from waeup.browser.interfaces import (IBreadcrumb, IBreadcrumbIgnorable,
    10                                       IBreadcrumbContainer)
     8from waeup.sirp import interfaces
     9from waeup.sirp.browser.interfaces import (IBreadcrumb, IBreadcrumbIgnorable,
     10                                           IBreadcrumbContainer)
    1111       
    1212class Breadcrumb(grok.Adapter):
  • waeup/branches/ulif-namespace/src/waeup/sirp/browser/layout.py

    r4789 r4796  
    44from hurry import yui
    55from megrok.layout import Page, Layout, EditForm, DisplayForm, AddForm
    6 from waeup.interfaces import IWAeUPObject
     6from waeup.sirp.interfaces import IWAeUPObject
    77from z3c.flashmessage.interfaces import IMessageSource
    88from zope.component import queryUtility, ComponentLookupError
  • waeup/branches/ulif-namespace/src/waeup/sirp/browser/pages.py

    r4789 r4796  
    1010from hurry.query.query import Query, Text
    1111from hurry.workflow.interfaces import NoTransitionAvailableError
    12 from waeup.browser import (WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage,
    13                            WAeUPDisplayFormPage, NullValidator)
    14 from waeup.catalog import search, search_context
    15 from waeup.datacenter import Import
    16 from waeup.interfaces import (IUniversity, IWAeUPObject, IUserContainer,
    17                               IUserAccount, IFacultyContainer, IDataCenter,
    18                               IFaculty, IDepartment, ICourse, ICertificate,
    19                               ICertificateCourse, IWAeUPXMLImporter,
    20                               IWAeUPXMLExporter)
    21 from waeup.widgets.interfaces import ITableProvider
    22 from waeup.utils.helpers import getName
     12from waeup.sirp.browser import (WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage,
     13                                WAeUPDisplayFormPage, NullValidator)
     14from waeup.sirp.catalog import search, search_context
     15from waeup.sirp.datacenter import Import
     16from waeup.sirp.interfaces import (
     17    IUniversity, IWAeUPObject, IUserContainer, IUserAccount,
     18    IFacultyContainer, IDataCenter, IFaculty, IDepartment, ICourse,
     19    ICertificate, ICertificateCourse, IWAeUPXMLImporter, IWAeUPXMLExporter)
     20from waeup.sirp.widgets.interfaces import ITableProvider
     21from waeup.sirp.utils.helpers import getName
    2322from zope import schema
    2423from zope.app.security.interfaces import (IAuthentication,
  • waeup/branches/ulif-namespace/src/waeup/sirp/browser/viewlets.py

    r4789 r4796  
    66from zope.component import getMultiAdapter
    77from zope.location.interfaces import ISite
    8 from waeup.browser.pages import (UniversityPage, FacultyContainerPage,
    9                                  DatacenterPage, FacultyPage, DepartmentPage,
    10                                  CoursePage, CertificatePage,
    11                                  CertificateCoursePage)
    12 from waeup.browser.interfaces import IBreadcrumbContainer
    13 from waeup.interfaces import (IUniversity, IWAeUPObject, IWAeUPXMLExporter,
    14                               IWAeUPXMLImporter, IFacultyContainer, IFaculty,
    15                               IDepartment, ICourse, ICertificate,
    16                               ICertificateCourse, IDataCenter)
     8from waeup.sirp.browser.pages import (
     9    UniversityPage, FacultyContainerPage, DatacenterPage, FacultyPage,
     10    DepartmentPage, CoursePage, CertificatePage, CertificateCoursePage)
     11from waeup.sirp.browser.interfaces import IBreadcrumbContainer
     12from waeup.sirp.interfaces import (
     13    IUniversity, IWAeUPObject, IWAeUPXMLExporter, IWAeUPXMLImporter,
     14    IFacultyContainer, IFaculty, IDepartment, ICourse, ICertificate,
     15    ICertificateCourse, IDataCenter)
    1716
    1817grok.templatedir('templates')
  • waeup/branches/ulif-namespace/src/waeup/sirp/catalog.py

    r4789 r4796  
    44from hurry.query.query import Query, Text
    55from hurry.query import Eq
    6 from waeup.app import University
    7 from waeup.interfaces import ICourse, ICertificateCourse
    8 from waeup.student.interfaces import IStudent
     6from waeup.sirp.app import University
     7from waeup.sirp.interfaces import ICourse, ICertificateCourse
     8from waeup.sirp.student.interfaces import IStudent
    99from zope.app.catalog.interfaces import ICatalog
    1010from zope.app.intid.interfaces import IIntIds
  • waeup/branches/ulif-namespace/src/waeup/sirp/csvfile/__init__.py

    r4789 r4796  
    11# Make this a package.
    2 from waeup.csvfile.csvfile import getCSVFile, CSVFile
    3 from waeup.csvfile.util import toBool
     2from waeup.sirp.csvfile.csvfile import getCSVFile, CSVFile
     3from waeup.sirp.csvfile.util import toBool
  • waeup/branches/ulif-namespace/src/waeup/sirp/csvfile/csvfile.py

    r4789 r4796  
    66import csv
    77import grok
    8 from waeup.csvfile.interfaces import ICSVFile
     8from waeup.sirp.csvfile.interfaces import ICSVFile
    99
    1010class CSVFile(grok.Adapter):
  • waeup/branches/ulif-namespace/src/waeup/sirp/csvfile/meta.py

    r4789 r4796  
    22"""
    33import martian
    4 import waeup.csvfile.csvfile
    5 from waeup.csvfile import CSVFile
     4import waeup.sirp.csvfile.csvfile
     5from waeup.sirp.csvfile import CSVFile
    66
    77# This grokker fills the registry on startup, with any class that is
     
    1010    martian.component(CSVFile)
    1111    def execute(self, klass, **kw):
    12         waeup.csvfile.csvfile.csvwrappers.append(klass)
     12        waeup.sirp.csvfile.csvfile.csvwrappers.append(klass)
    1313        return True
  • waeup/branches/ulif-namespace/src/waeup/sirp/datacenter.py

    r4789 r4796  
    99from datetime import datetime
    1010from zope.component import getMultiAdapter
    11 from waeup.csvfile import getCSVFile
    12 from waeup.interfaces import (IDataCenter, IWAeUPCSVImporter,
    13                               ICSVDataReceivers, IDataCenterFile)
    14 from waeup.utils.helpers import copyFileSystemTree
     11from waeup.sirp.csvfile import getCSVFile
     12from waeup.sirp.interfaces import (IDataCenter, IWAeUPCSVImporter,
     13                                   ICSVDataReceivers, IDataCenterFile)
     14from waeup.sirp.utils.helpers import copyFileSystemTree
    1515
    1616class DataCenter(grok.Container):
  • waeup/branches/ulif-namespace/src/waeup/sirp/hostel/hostel.py

    r4789 r4796  
    11import grok
    2 from waeup.interfaces import IHostel
     2from waeup.sirp.interfaces import IHostel
    33
    44class Hostel(grok.Container):
  • waeup/branches/ulif-namespace/src/waeup/sirp/hostel/hostelcontainer.py

    r4789 r4796  
    22from zope.component.interfaces import IFactory
    33from zope.interface import implementedBy
    4 from waeup.interfaces import IHostelContainer, IHostel
     4from waeup.sirp.interfaces import IHostelContainer, IHostel
    55
    66class HostelContainer(grok.Container):
  • waeup/branches/ulif-namespace/src/waeup/sirp/interfaces.py

    r4789 r4796  
    77from zope import schema
    88from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
    9 from waeup.permissions import RoleSource
     9from waeup.sirp.permissions import RoleSource
    1010
    1111def SimpleWAeUPVocabulary(*terms):
  • waeup/branches/ulif-namespace/src/waeup/sirp/student/student.py

    r4789 r4796  
    11import grok
    22from grok import index
    3 from waeup.student.interfaces import IStudent
     3from waeup.sirp.student.interfaces import IStudent
    44
    55def fromCsv(a):
  • waeup/branches/ulif-namespace/src/waeup/sirp/student/studentcontainer.py

    r4789 r4796  
    33from zope.component.interfaces import IFactory
    44from zope.interface import implementedBy
    5 from waeup.interfaces import IStudentContainer
    6 from waeup.utils import importexport as csv
     5from waeup.sirp.interfaces import IStudentContainer
     6from waeup.sirp.utils import importexport as csv
    77
    88class StudentContainer(grok.Container):
  • waeup/branches/ulif-namespace/src/waeup/sirp/tables.py

    r4789 r4796  
    22"""
    33import grok
    4 from waeup.interfaces import (IUniversity, IFacultyContainer, IFaculty,
    5                               IDepartment, ICourseContainer)
    6 from waeup.widgets.interfaces import ITableProvider
    7 from waeup.widgets.table import YUITable as Table
    8 from waeup.widgets.table import Col
     4from waeup.sirp.interfaces import (IUniversity, IFacultyContainer, IFaculty,
     5                                   IDepartment, ICourseContainer)
     6from waeup.sirp.widgets.interfaces import ITableProvider
     7from waeup.sirp.widgets.table import YUITable as Table
     8from waeup.sirp.widgets.table import Col
    99from zope.security.management import checkPermission
    1010
  • waeup/branches/ulif-namespace/src/waeup/sirp/tests/test_waeup.py

    r4789 r4796  
    66import grok
    77import zope.component.eventtesting
    8 from waeup.testing import FunctionalLayer
     8from waeup.sirp.testing import FunctionalLayer
    99
    1010def setUpZope(test):
     
    1313# Register all tests in the waeup_ng package
    1414test_suite = grok.testing.register_all_tests(
    15     'waeup', usetup=setUpZope,
     15    'waeup.sirp', usetup=setUpZope,
    1616    layer=FunctionalLayer)
  • waeup/branches/ulif-namespace/src/waeup/sirp/university/certificate.py

    r4789 r4796  
    77from zope.component.interfaces import IFactory, ComponentLookupError
    88from zope.interface import implementedBy
    9 from waeup.interfaces import ICertificate, ICertificateCourse, ICourse
     9from waeup.sirp.interfaces import ICertificate, ICertificateCourse, ICourse
    1010
    1111class Certificate(grok.Container):
  • waeup/branches/ulif-namespace/src/waeup/sirp/university/certificatecontainer.py

    r4789 r4796  
    22"""
    33import grok
    4 from waeup.interfaces import ICertificateContainer, ICertificate
     4from waeup.sirp.interfaces import ICertificateContainer, ICertificate
    55from zope.component.interfaces import IFactory
    66from zope.interface import implementedBy
  • waeup/branches/ulif-namespace/src/waeup/sirp/university/course.py

    r4789 r4796  
    44from zope.interface import implementedBy
    55from zope.component.interfaces import IFactory
    6 from waeup.interfaces import ICourse
     6from waeup.sirp.interfaces import ICourse
    77
    88class Course(grok.Model):
  • waeup/branches/ulif-namespace/src/waeup/sirp/university/coursecontainer.py

    r4789 r4796  
    44from zope.interface import implementedBy
    55from zope.component.interfaces import IFactory
    6 from waeup.interfaces import ICourseContainer, ICourse
     6from waeup.sirp.interfaces import ICourseContainer, ICourse
    77
    88class CourseContainer(grok.Container):
  • waeup/branches/ulif-namespace/src/waeup/sirp/university/department.py

    r4789 r4796  
    55from zope.component.interfaces import IFactory
    66from zope.interface import implementedBy
    7 from waeup.interfaces import IDepartment
     7from waeup.sirp.interfaces import IDepartment
    88
    99class Department(grok.Container):
  • waeup/branches/ulif-namespace/src/waeup/sirp/university/faculty.py

    r4789 r4796  
    55from zope.component.interfaces import IFactory
    66from zope.interface import implementedBy
    7 from waeup.interfaces import IFaculty, IDepartment
     7from waeup.sirp.interfaces import IFaculty, IDepartment
    88
    99class Faculty(grok.Container):
  • waeup/branches/ulif-namespace/src/waeup/sirp/university/facultycontainer.py

    r4789 r4796  
    22from zope.component.interfaces import IFactory
    33from zope.interface import implementedBy
    4 from waeup.interfaces import IFacultyContainer, IFaculty
     4from waeup.sirp.interfaces import IFacultyContainer, IFaculty
    55
    66class FacultyContainer(grok.Container):
  • waeup/branches/ulif-namespace/src/waeup/sirp/users.py

    r4789 r4796  
    22"""
    33import grok
    4 from waeup.authentication import Account
    5 from waeup.interfaces import IUserContainer
     4from waeup.sirp.authentication import Account
     5from waeup.sirp.interfaces import IUserContainer
    66
    77class UserContainer(grok.Container):
  • waeup/branches/ulif-namespace/src/waeup/sirp/utils/csvimport.py

    r4789 r4796  
    22"""
    33import grok
    4 from waeup.csvfile import CSVFile, toBool
    5 from waeup.csvfile.interfaces import ICSVFile
    6 from waeup.interfaces import IFacultyContainer, IWAeUPCSVImporter
    7 from waeup.utils.importexport import CSVImporter
     4from waeup.sirp.csvfile import CSVFile, toBool
     5from waeup.sirp.csvfile.interfaces import ICSVFile
     6from waeup.sirp.interfaces import IFacultyContainer, IWAeUPCSVImporter
     7from waeup.sirp.utils.importexport import CSVImporter
    88from zope.app.catalog.interfaces import ICatalog
    99from zope.component import createObject, getUtility
  • waeup/branches/ulif-namespace/src/waeup/sirp/utils/importexport.py

    r4789 r4796  
    77from xml.dom.minidom import Document, getDOMImplementation
    88from zope.interface import Interface
    9 from waeup.csvfile.interfaces import ICSVFile
    10 from waeup.interfaces import (IWAeUPObject, IWAeUPExporter, IWAeUPXMLExporter,
    11                               IWAeUPXMLImporter, IWAeUPCSVImporter)
     9from waeup.sirp.csvfile.interfaces import ICSVFile
     10from waeup.sirp.interfaces import (
     11    IWAeUPObject, IWAeUPExporter, IWAeUPXMLExporter, IWAeUPXMLImporter,
     12    IWAeUPCSVImporter)
    1213
    1314def readFile(f):
  • waeup/branches/ulif-namespace/src/waeup/sirp/widgets/table.py

    r4789 r4796  
    44from hurry import yui
    55from zope.interface import Interface
    6 from waeup.widgets.interfaces import ITableProvider
     6from waeup.sirp.widgets.interfaces import ITableProvider
    77
    88def varName(string):
  • waeup/branches/ulif-namespace/src/waeup/sirp/workflow.py

    r4789 r4796  
    77from hurry.workflow.interfaces import IWorkflow, IWorkflowState, IWorkflowInfo
    88from hurry.workflow.interfaces import IWorkflowVersions
    9 from waeup.interfaces import IWAeUPObject
     9from waeup.sirp.interfaces import IWAeUPObject
    1010
    1111UNCHECKED = 'unchecked'
Note: See TracChangeset for help on using the changeset viewer.