Changeset 5689 for main/waeup.sirp/trunk/src/waeup/sirp

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:

• __init__.py (modified) (1 diff)
• applicants.py (modified) (1 diff)
• authentication.py (modified) (1 diff)
• batching.py (modified) (1 diff)
• jambtables.py (modified) (1 diff)
• tests/test_authentication.py (modified) (1 diff)
• tests/test_batching.py (modified) (1 diff)
• tests/test_interfaces.py (modified) (1 diff)
• tests/test_jambtables.py (modified) (1 diff)
• tests/test_util.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/__init__.py

@@ -1 +1 @@
 # Make this a package.
-from waeup.sirp.jambtables.applicants import (
+from waeup.sirp.applicants.jambtables.applicants import (
     ResultEntry, Applicant, ApplicantFactory, ApplicantContainer,
     )
-from waeup.sirp.jambtables.batching import ApplicantImporter
-from waeup.sirp.jambtables.jambtables import JAMBDataTable, JAMB_DATA_HEADERS
-
+from waeup.sirp.applicants.jambtables.batching import ApplicantImporter
+from waeup.sirp.applicants.jambtables.jambtables import (
+    JAMBDataTable, JAMB_DATA_HEADERS
+    )
 
 __all__ = (

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/applicants.py

@@ -25 +25 @@
 from zope.schema.fieldproperty import FieldProperty
 from waeup.sirp.interfaces import IWAeUPSIRPPluggable
-from waeup.sirp.jambtables.interfaces import (
+from waeup.sirp.applicants.jambtables.interfaces import (
     IResultEntry, IApplicant, IApplicantContainer, IApplicantPDEEditData
     )

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/authentication.py

@@ -35 +35 @@
 from zope.session.interfaces import ISession
 from waeup.sirp.authentication import Account, PrincipalInfo
-from waeup.sirp.jambtables.interfaces import (
+from waeup.sirp.applicants.jambtables.interfaces import (
     IApplicantPrincipalInfo, IApplicantPrincipal, IApplicantSessionCredentials,
     IJAMBApplicantSessionCredentials)
-from waeup.sirp.jambtables.util import get_applicant_data, application_exists
+from waeup.sirp.applicants.jambtables.util import (
+    get_applicant_data, application_exists,
+    )
 from waeup.sirp.accesscodes import get_access_code
 

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/batching.py

@@ -26 +26 @@
 from waeup.sirp.interfaces import IBatchProcessor
 from waeup.sirp.utils.batching import BatchProcessor
-from waeup.sirp.jambtables.interfaces import IApplicantPDEImportData
+from waeup.sirp.applicants.jambtables.interfaces import IApplicantPDEImportData
 
 class ApplicantImporter(BatchProcessor):

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/jambtables.py

@@ -34 +34 @@
 from BTrees.Length import Length
 
-from waeup.sirp.jambtables.interfaces import IJAMBDataTable
+from waeup.sirp.applicants.jambtables.interfaces import IJAMBDataTable
 
 #: The header fields required for a valid JAMB table CSV file.

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_authentication.py

@@ -34 +34 @@
 from zope.site.testing import siteSetUp, siteTearDown
 from zope.testing import cleanup
-from waeup.sirp.jambtables.authentication import (
+from waeup.sirp.applicants.jambtables.authentication import (
     ApplicantsAuthenticatorPlugin, WAeUPApplicantCredentialsPlugin,
     ApplicantCredentials, AuthenticatedApplicantPrincipalFactory,
     ApplicantPrincipalInfo, ApplicantPrincipal)
-from waeup.sirp.jambtables.interfaces import(
+from waeup.sirp.applicants.jambtables.interfaces import(
     IJAMBApplicantSessionCredentials,)
 

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_batching.py

@@ -26 +26 @@
 from zope.interface import verify
 from waeup.sirp.interfaces import IBatchProcessor
-from waeup.sirp.jambtables import ApplicantImporter
+from waeup.sirp.applicants.jambtables import ApplicantImporter
 
 class ApplicantImporterTest(unittest.TestCase):

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_interfaces.py

@@ -27 +27 @@
 from zope.component import getMultiAdapter
 from zope.publisher.browser import TestRequest
-from waeup.sirp.jambtables.interfaces import GenderSource
+from waeup.sirp.applicants.jambtables.interfaces import GenderSource
 
 class InterfacesTest(unittest.TestCase):

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_jambtables.py

@@ -39 +39 @@
 from waeup.sirp.app import University
 from waeup.sirp.datacenter import DataCenter
-from waeup.sirp.jambtables import JAMBDataTable
-from waeup.sirp.jambtables.interfaces import IJAMBDataTable
+from waeup.sirp.applicants.jambtables import JAMBDataTable
+from waeup.sirp.applicants.jambtables.interfaces import IJAMBDataTable
 
 

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_util.py

@@ -27 +27 @@
 from zope.site.folder import Folder
 from zope.site.testing import siteSetUp, siteTearDown
-from waeup.sirp.jambtables.tests.test_authentication import (
+from waeup.sirp.applicants.jambtables.tests.test_authentication import (
     FakeSite)
-from waeup.sirp.jambtables.util import application_exists, get_applicant_data
+from waeup.sirp.applicants.jambtables.util import (
+    application_exists, get_applicant_data
+    )
 
 class HelperToolsTest(unittest.TestCase):