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

Timestamp:

11 Aug 2011, 09:28:06 (13 years ago)

Author:

uli

Message:

Remove unnecessary return. We use createWAeUPImageFile in order to get
an image file with an image id as data and not the raw binary file
data. Creating a WAeUPImageFile directly (WAeUPImageFile(filename,
filedata)) would mean to store the binary image data in the
WAeUPImageFile itself (and therefore in the ZODB).

File:

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

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

@@ -34 +34 @@
 from zope.security.interfaces import IGroupClosureAwarePrincipal as IPrincipal
 from zc.sourcefactory.basic import BasicSourceFactory
+from waeup.sirp.image import createWAeUPImageFile
 from waeup.sirp.image.schema import ImageFile
-from waeup.sirp.image.image import WAeUPImageFile
 from waeup.sirp.interfaces import IWAeUPObject
 from waeup.sirp.university.vocabularies import application_categories
@@ -56 +56 @@
     __doc__ = u"Invalid email address"
 
-check_email = re.compile(r"[a-zA-Z0-9._%-]+@([a-zA-Z0-9-]+.)*[a-zA-Z]{2,4}").match
+check_email = re.compile(
+    r"[a-zA-Z0-9._%-]+@([a-zA-Z0-9-]+.)*[a-zA-Z]{2,4}").match
 def validate_email(value):
     if not check_email(value):
@@ -76 +77 @@
     provider.
     """
-    from waeup.sirp.image import createWAeUPImageFile
     imagefile = createWAeUPImageFile(
         'placeholder_m.jpg',
@@ -82 +82 @@
         )
     return imagefile
-    return WAeUPImageFile(
-        'placeholder_m.jpg', DEFAULT_PASSPORT_IMAGE_MALE)
 
 class ApplicantContainerProviderSource(BasicSourceFactory):