Changeset 7038 for main/waeup.sirp/branches

Timestamp:

8 Nov 2011, 20:48:58 (13 years ago)

Author:

uli

Message:

Remove obsolete imports/code, reorder imports

File:

• main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/applicants/applicant.py (modified) (4 diffs)

main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/applicants/applicant.py

@@ -23 +23 @@
 import grok
 from grok import index
-from zope.component import getUtility
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
-from waeup.sirp.interfaces import IObjectHistory, IExtFileStore
 from waeup.sirp.app import University
+from waeup.sirp.image import WAeUPImageFile
+from waeup.sirp.imagestorage import DefaultFileStoreHandler
+from waeup.sirp.interfaces import (
+    IObjectHistory, IFileStoreHandler, IFileStoreNameChooser)
+from waeup.sirp.utils.helpers import attrs_to_fields
 from waeup.sirp.applicants.interfaces import (
-    IResultEntry, IApplicant, IApplicantEdit, default_passport_image,
+    IResultEntry, IApplicant, IApplicantEdit,
     )
-from waeup.sirp.image import WAeUPImageFile
-from waeup.sirp.utils.helpers import attrs_to_fields
+
 
 def get_regno_or_ac(context):
@@ -57 +59 @@
         self.application_date = None
         return
-
-    #def getApplicantsRootLogger(self):
-    #    return grok.getSite()['applicants'].logger
 
     def loggerInfo(self, ob_class, comment=None):
@@ -90 +89 @@
     access_code = index.Field(attribute='access_code')
 
-#class ApplicantTraverser(grok.Traverser):
-#    """Get image of the context applicant.
-#
-#    Each applicant can provide a passport photograph which will be
-#    returned by this traverser if:
-#
-#    - we request the exact filename of the picture or
-#
-#    - ask for a picture named 'passport.jpg'.
-#
-#    If no picture was stored yet, we get a placeholder image when
-#    asking for `passport.jpg`.
-#
-#    If none of the above applies, we return ``None``, most probably
-#    resulting a :exc:`NotFound` exception.
-#
-#    """
-#    grok.context(IApplicant)
-#    def traverse(self, name):
-#        if name != 'passport.jpg':
-#            return
-#        marked_filename = '__img_appl__%s.jpg' % (
-#            get_regno_or_ac(self.context))
-#        image = getUtility(IExtFileStore).getFile(marked_filename)
-#        if image is None:
-#            # Return placeholder
-#            from waeup.sirp.applicants.interfaces import IMAGE_PATH
-#            return open(os.path.join(IMAGE_PATH, 'placeholder_m.jpg'), 'rb')
-#            pass
-#        return image #WAeUPImageFile(marked_filename, image.read())
-#        if not hasattr(self.context, 'passport'):
-#            return None
-#        passport_filename = getattr(self.context.passport, 'filename', None)
-#        if name == passport_filename:
-#            return self.context.passport
-#        if name == 'passport.jpg':
-#            if self.context.passport is not None:
-#                return self.context.passport
-#        return
-
 class ApplicantFactory(grok.GlobalUtility):
     """A factory for applicants.
@@ -144 +103 @@
         return implementedBy(Applicant)
 
-from waeup.sirp.interfaces import IFileStoreHandler, IFileStoreNameChooser
-from waeup.sirp.imagestorage import DefaultFileStoreHandler
 
+#: The file id marker for applicant passport images
 APPLICANT_IMAGE_STORE_NAME = 'img-applicant'