Ignore:
Timestamp:
26 Jan 2011, 12:19:40 (14 years ago)
Author:
uli
Message:

Fix various imports after package move.

Location:
main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/__init__.py

    r5672 r5689  
    11# Make this a package.
    2 from waeup.sirp.jambtables.applicants import (
     2from waeup.sirp.applicants.jambtables.applicants import (
    33    ResultEntry, Applicant, ApplicantFactory, ApplicantContainer,
    44    )
    5 from waeup.sirp.jambtables.batching import ApplicantImporter
    6 from waeup.sirp.jambtables.jambtables import JAMBDataTable, JAMB_DATA_HEADERS
    7 
     5from waeup.sirp.applicants.jambtables.batching import ApplicantImporter
     6from waeup.sirp.applicants.jambtables.jambtables import (
     7    JAMBDataTable, JAMB_DATA_HEADERS
     8    )
    89
    910__all__ = (
  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/applicants.py

    r5669 r5689  
    2525from zope.schema.fieldproperty import FieldProperty
    2626from waeup.sirp.interfaces import IWAeUPSIRPPluggable
    27 from waeup.sirp.jambtables.interfaces import (
     27from waeup.sirp.applicants.jambtables.interfaces import (
    2828    IResultEntry, IApplicant, IApplicantContainer, IApplicantPDEEditData
    2929    )
  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/authentication.py

    r5497 r5689  
    3535from zope.session.interfaces import ISession
    3636from waeup.sirp.authentication import Account, PrincipalInfo
    37 from waeup.sirp.jambtables.interfaces import (
     37from waeup.sirp.applicants.jambtables.interfaces import (
    3838    IApplicantPrincipalInfo, IApplicantPrincipal, IApplicantSessionCredentials,
    3939    IJAMBApplicantSessionCredentials)
    40 from waeup.sirp.jambtables.util import get_applicant_data, application_exists
     40from waeup.sirp.applicants.jambtables.util import (
     41    get_applicant_data, application_exists,
     42    )
    4143from waeup.sirp.accesscodes import get_access_code
    4244
  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/batching.py

    r5475 r5689  
    2626from waeup.sirp.interfaces import IBatchProcessor
    2727from waeup.sirp.utils.batching import BatchProcessor
    28 from waeup.sirp.jambtables.interfaces import IApplicantPDEImportData
     28from waeup.sirp.applicants.jambtables.interfaces import IApplicantPDEImportData
    2929
    3030class ApplicantImporter(BatchProcessor):
  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/jambtables.py

    r5328 r5689  
    3434from BTrees.Length import Length
    3535
    36 from waeup.sirp.jambtables.interfaces import IJAMBDataTable
     36from waeup.sirp.applicants.jambtables.interfaces import IJAMBDataTable
    3737
    3838#: The header fields required for a valid JAMB table CSV file.
  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_authentication.py

    r5470 r5689  
    3434from zope.site.testing import siteSetUp, siteTearDown
    3535from zope.testing import cleanup
    36 from waeup.sirp.jambtables.authentication import (
     36from waeup.sirp.applicants.jambtables.authentication import (
    3737    ApplicantsAuthenticatorPlugin, WAeUPApplicantCredentialsPlugin,
    3838    ApplicantCredentials, AuthenticatedApplicantPrincipalFactory,
    3939    ApplicantPrincipalInfo, ApplicantPrincipal)
    40 from waeup.sirp.jambtables.interfaces import(
     40from waeup.sirp.applicants.jambtables.interfaces import(
    4141    IJAMBApplicantSessionCredentials,)
    4242
  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_batching.py

    r5473 r5689  
    2626from zope.interface import verify
    2727from waeup.sirp.interfaces import IBatchProcessor
    28 from waeup.sirp.jambtables import ApplicantImporter
     28from waeup.sirp.applicants.jambtables import ApplicantImporter
    2929
    3030class ApplicantImporterTest(unittest.TestCase):
  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_interfaces.py

    r5469 r5689  
    2727from zope.component import getMultiAdapter
    2828from zope.publisher.browser import TestRequest
    29 from waeup.sirp.jambtables.interfaces import GenderSource
     29from waeup.sirp.applicants.jambtables.interfaces import GenderSource
    3030
    3131class InterfacesTest(unittest.TestCase):
  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_jambtables.py

    r5465 r5689  
    3939from waeup.sirp.app import University
    4040from waeup.sirp.datacenter import DataCenter
    41 from waeup.sirp.jambtables import JAMBDataTable
    42 from waeup.sirp.jambtables.interfaces import IJAMBDataTable
     41from waeup.sirp.applicants.jambtables import JAMBDataTable
     42from waeup.sirp.applicants.jambtables.interfaces import IJAMBDataTable
    4343
    4444
  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_util.py

    r5466 r5689  
    2727from zope.site.folder import Folder
    2828from zope.site.testing import siteSetUp, siteTearDown
    29 from waeup.sirp.jambtables.tests.test_authentication import (
     29from waeup.sirp.applicants.jambtables.tests.test_authentication import (
    3030    FakeSite)
    31 from waeup.sirp.jambtables.util import application_exists, get_applicant_data
     31from waeup.sirp.applicants.jambtables.util import (
     32    application_exists, get_applicant_data
     33    )
    3234
    3335class HelperToolsTest(unittest.TestCase):
Note: See TracChangeset for help on using the changeset viewer.