Changeset 3254 for WAeUP_SRP

Timestamp:

28 Feb 2008, 13:06:20 (17 years ago)

Author:

joachim

Message:

raise KeyError? if key is not in Vocabulary

Location:

WAeUP_SRP/base/skins

Files:

• waeup_academics/getCertificatesVoc.py (modified) (1 diff)
• waeup_academics/getDepartmentsVoc.py (modified) (1 diff)
• waeup_accommodation/reservedRoomsVoc.py (modified) (1 diff)
• waeup_default/getSessionsVoc.py (modified) (1 diff)
• waeup_student/getStudentLevelsVoc.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_academics/getCertificatesVoc.py

@@ -11 +11 @@
 if res:
     return [-1].Title
-return "unknown Faculty %s" % key
+raise KeyError

WAeUP_SRP/base/skins/waeup_academics/getDepartmentsVoc.py

@@ -11 +11 @@
 if res:
     return res[-1].Title
-return "unknown Department %s" % key
 
+raise KeyError
+

WAeUP_SRP/base/skins/waeup_accommodation/reservedRoomsVoc.py

@@ -15 +15 @@
     if k == key:
         return v
+raise KeyError

WAeUP_SRP/base/skins/waeup_default/getSessionsVoc.py

@@ -15 +15 @@
     y = int(key)
 except:
-    return key
+    raise KeyError
 if y == -1:
-    return ''
+    raise KeyError
 if y < 90:
     cent = 2000

WAeUP_SRP/base/skins/waeup_student/getStudentLevelsVoc.py

@@ -33 +33 @@
     ikey = int(key)
 else:
-    return ''
+    raise KeyError
 level_nr,repeat = divmod(ikey, 100)
 l = []
 
-level = context.portal_vocabularies.levels.get("%d00" % level_nr)
+level = context.portal_vocabularies.levels.get("%d00" % level_nr,None)
+if level is None:
+    raise KeyError
+    
 if level_nr > end_level/100:
     return "%s Spillover" % context.portal_vocabularies.levels.get("%d00" % (level_nr - 1))