Changeset 11450

Timestamp:

27 Feb 2014, 06:25:18 (11 years ago)

Author:

Henrik Bettermann

Message:

Move ContextualDictSourceFactoryBase? to waeup.kofa.interfaces to avoid circular imports.

Location:

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

Files:

• hostels/vocabularies.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)
• payments/interfaces.py (modified) (1 diff)
• students/interfaces.py (modified) (2 diffs)
• university/vocabularies.py (modified) (2 diffs)

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

@@ -22 +22 @@
 from zope.catalog.interfaces import ICatalog
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
-from waeup.kofa.interfaces import SimpleKofaVocabulary
+from waeup.kofa.interfaces import (
+    SimpleKofaVocabulary, ContextualDictSourceFactoryBase)
 from waeup.kofa.interfaces import MessageFactory as _
-from waeup.kofa.university.vocabularies import ContextualDictSourceFactoryBase
 
 NOT_OCCUPIED = u'not occupied'

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

@@ -36 +36 @@
 from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 from waeup.kofa.schema import PhoneNumber
+from waeup.kofa.sourcefactory import SmartBasicContextualSourceFactory
 
 _ = MessageFactory = zope.i18nmessageid.MessageFactory('waeup.kofa')
@@ -104 +105 @@
     )
 
+class ContextualDictSourceFactoryBase(SmartBasicContextualSourceFactory):
+    """A base for contextual sources based on KofaUtils dicts.
+
+    To create a real source, you have to set the `DICT_NAME` attribute
+    which should be the name of a dictionary in KofaUtils.
+    """
+    def getValues(self, context):
+        utils = getUtility(IKofaUtils)
+        return sorted(getattr(utils, self.DICT_NAME).keys())
+
+    def getToken(self, context, value):
+        return str(value)
+
+    def getTitle(self, context, value):
+        utils = getUtility(IKofaUtils)
+        return getattr(utils, self.DICT_NAME)[value]
+
 class SubjectSource(BasicSourceFactory):
     """A source for school subjects used in exam documentation.

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

@@ -18 +18 @@
 from zope.interface import Attribute
 from zope import schema
-from waeup.kofa.university.vocabularies import ContextualDictSourceFactoryBase
 from waeup.kofa.interfaces import (
-    IKofaObject, SimpleKofaVocabulary, academic_sessions_vocab)
+    IKofaObject, SimpleKofaVocabulary, academic_sessions_vocab,
+    ContextualDictSourceFactoryBase)
 from waeup.kofa.interfaces import MessageFactory as _
 

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

@@ -23 +23 @@
 from waeup.kofa.browser.interfaces import IStudentNavigationBase
 from waeup.kofa.interfaces import (
-    IKofaObject, academic_sessions_vocab, validate_email, ICSVExporter)
+    IKofaObject, academic_sessions_vocab, validate_email, ICSVExporter,
+    ContextualDictSourceFactoryBase)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.schema import TextLineChoice, FormattedDate, PhoneNumber
@@ -34 +35 @@
 from waeup.kofa.university.vocabularies import (
     CourseSource, StudyModeSource, CertificateSource, SemesterSource,
-    ContextualDictSourceFactoryBase)
+    )
 
 class PreviousPaymentCategorySource(ContextualDictSourceFactoryBase):

main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py

@@ -21 +21 @@
 from zope.catalog.interfaces import ICatalog
 from zope.component import getUtility, queryUtility
-from waeup.kofa.interfaces import SimpleKofaVocabulary, IKofaUtils
+from waeup.kofa.interfaces import (
+    SimpleKofaVocabulary, IKofaUtils, ContextualDictSourceFactoryBase)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.sourcefactory import SmartBasicContextualSourceFactory
@@ -39 +40 @@
     (_('Postgraduate Level'),999),
     )
-
-#: An instance of :class:`waeup.kofa.utils.utils.KofaUtils` for fallback.
-KOFA_UTILS = KofaUtils()
-
-class ContextualDictSourceFactoryBase(SmartBasicContextualSourceFactory):
-    """A base for contextual sources based on KofaUtils dicts.
-
-    To create a real source, you have to set the `DICT_NAME` attribute
-    which should be the name of a dictionary in KofaUtils.
-    """
-    def getValues(self, context):
-        utils = queryUtility(IKofaUtils, default=KOFA_UTILS)
-        return sorted(getattr(utils, self.DICT_NAME).keys())
-
-    def getToken(self, context, value):
-        return str(value)
-
-    def getTitle(self, context, value):
-        utils = queryUtility(IKofaUtils, default=KOFA_UTILS)
-        return getattr(utils, self.DICT_NAME)[value]
 
 class SemesterSource(ContextualDictSourceFactoryBase):