Changeset 7089

Timestamp:

12 Nov 2011, 06:47:00 (13 years ago)

Author:

uli

Message:

Use path to default passport image instead of open file descriptor.
If we would use a file descriptor, we had to make sure to reset it after
each read (seek(0), which did not happen) and we could run into trouble
when multiple requests/threads access the file at the same time.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)

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

@@ -68 +68 @@
     IApplicant, IApplicantPrincipal,IApplicantEdit, IApplicantsRoot,
     IApplicantsContainer, IApplicantsContainerAdd, application_types_vocab,
-     DEFAULT_PASSPORT_IMAGE_MALE, MAX_UPLOAD_SIZE,
+    DEFAULT_PASSPORT_IMAGE_PATH, MAX_UPLOAD_SIZE,
     )
 from waeup.sirp.applicants.workflow import INITIALIZED, STARTED
@@ -655 +655 @@
         img = getUtility(IExtFileStore).getFileByContext(self.context)
         if img is None:
-            img = DEFAULT_PASSPORT_IMAGE_MALE
+            img = open(DEFAULT_PASSPORT_IMAGE_PATH, 'rb')
         doc_img = Image(img.name, width=4*cm, height=3*cm, kind='bound')
         story.append(doc_img)
@@ -868 +868 @@
         if image is None:
             # show placeholder image
-            return DEFAULT_PASSPORT_IMAGE_MALE
+            return open(DEFAULT_PASSPORT_IMAGE_PATH, 'rb').read()
         return image

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

@@ -48 +48 @@
     'static'
     )
-DEFAULT_PASSPORT_IMAGE_MALE = open(
-    os.path.join(IMAGE_PATH, 'placeholder_m.jpg'))
+
+#: Filesystem path to default passport image
+DEFAULT_PASSPORT_IMAGE_PATH = os.path.join(IMAGE_PATH, 'placeholder_m.jpg')
 
 #: Maximum upload size for applicant passport photographs (in bytes)