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

Timestamp:

9 Jun 2011, 23:58:39 (14 years ago)

Author:

uli

Message:

• Make passport image placeholder constants strings instead of WAeUPImageFile instances. It turned out that defining WAeUPImageFile instances as constants gives some nasty (although most probably harmless) error messages at end of test runs.

• Adapt the default value provider for passport fieds appropriately.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py (modified) (2 diffs)

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

@@ -47 +47 @@
     'static'
     )
-DEFAULT_PASSPORT_IMAGE_MALE = WAeUPImageFile(
-    'passport.jpg',
-    open(os.path.join(IMAGE_PATH, 'placeholder_m.jpg')).read(),
-    )
-DEFAULT_PASSPORT_IMAGE_FEMALE = WAeUPImageFile(
-    'passport.jpg',
-    open(os.path.join(IMAGE_PATH, 'placeholder_f.jpg')).read(),
-    )
+DEFAULT_PASSPORT_IMAGE_MALE = open(
+    os.path.join(IMAGE_PATH, 'placeholder_m.jpg')).read()
+DEFAULT_PASSPORT_IMAGE_FEMALE = open(
+    os.path.join(IMAGE_PATH, 'placeholder_f.jpg')).read()
 
 @provider(schema.interfaces.IContextAwareDefaultFactory)
@@ -70 +66 @@
     provider.
     """
-    return DEFAULT_PASSPORT_IMAGE_MALE
+    return WAeUPImageFile(
+        'placeholder_m.jpg', DEFAULT_PASSPORT_IMAGE_MALE)
 
 class ApplicantContainerProviderSource(BasicSourceFactory):