Index: /main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/applicants/interfaces.py
===================================================================
--- /main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/applicants/interfaces.py	(revision 7789)
+++ /main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/applicants/interfaces.py	(revision 7790)
@@ -18,27 +18,23 @@
 """Interfaces of the university application package.
 """
-
 from grokcore.content.interfaces import IContainer
-
+from zc.sourcefactory.basic import BasicSourceFactory
+from zc.sourcefactory.contextual import BasicContextualSourceFactory
 from zope import schema
-from zope.interface import Interface, Attribute, implements, directlyProvides
 from zope.component import getUtilitiesFor, queryUtility, getUtility
 from zope.catalog.interfaces import ICatalog
+from zope.interface import Interface, Attribute, implements, directlyProvides
 from zope.schema.interfaces import (
     ValidationError, ISource, IContextSourceBinder)
-from zc.sourcefactory.basic import BasicSourceFactory
-from zc.sourcefactory.contextual import BasicContextualSourceFactory
 from waeup.sirp.schema import TextLineChoice
 from waeup.sirp.interfaces import (
-    ISIRPObject, year_range, validate_email, academic_sessions_vocab,
-    SubjectSource, GradeSource, IResultEntry)
+    ISIRPObject, year_range, validate_email, academic_sessions_vocab)
 from waeup.sirp.interfaces import MessageFactory as _
+from waeup.sirp.payments.interfaces import IOnlinePayment
 from waeup.sirp.schoolgrades import ResultEntryField
+from waeup.sirp.students.vocabularies import (
+    lgas_vocab, CertificateSource, GenderSource)
 from waeup.sirp.university.vocabularies import (
     course_levels, AppCatSource)
-from waeup.sirp.students.vocabularies import (
-    lgas_vocab, CertificateSource, GenderSource)
-from waeup.sirp.payments.interfaces import IOnlinePayment
-from waeup.sirp.schema import MultiValObject
 
 #: Maximum upload size for applicant passport photographs (in bytes)
