Changeset 6839

Timestamp:

1 Oct 2011, 06:44:44 (13 years ago)

Author:

Henrik Bettermann

Message:

Use common and coherent naming convention for all event handlers.

Location:

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

Files:

• app.py (modified) (1 diff)
• authentication.py (modified) (1 diff)
• students/student.py (modified) (2 diffs)
• university/catalog.py (modified) (4 diffs)
• university/certificate.py (modified) (1 diff)
• users.py (modified) (1 diff)
• utils/logger.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/app.py

@@ -73 +73 @@
 
 @grok.subscribe(University, grok.IObjectAddedEvent)
-def handle_university_add(app, event):
+def handle_university_added(app, event):
     app.logger.info('University `%s` added.' % getattr(app, '__name__', None))
     return

main/waeup.sirp/trunk/src/waeup/sirp/authentication.py

@@ -172 +172 @@
 
 @grok.subscribe(IUserAccount, grok.IObjectRemovedEvent)
-def handle_account_removal(account, event):
+def handle_account_removed(account, event):
     """When an account is removed, local roles might have to be deleted.
     """

main/waeup.sirp/trunk/src/waeup/sirp/students/student.py

@@ -96 +96 @@
 
 @grok.subscribe(IStudent, grok.IObjectAddedEvent)
-def addStudentHandler(student, event):
+def handle_student_added(student, event):
     """If a student is added all subcontainers are automatically added
     and the transition create is fired. The latter produces a logging message.
@@ -118 +118 @@
 
 @grok.subscribe(IStudent, grok.IObjectRemovedEvent)
-def removedStudentHandler(student, event):
+def handle_student_removed(student, event):
     """If a student is removed a message is logged.
     """

main/waeup.sirp/trunk/src/waeup/sirp/university/catalog.py

@@ -48 +48 @@
 
 @grok.subscribe(ICourse, grok.IObjectAddedEvent)
-def handleCourseAdd(obj, event):
+def handle_course_added(obj, event):
     """Index an added course with the local catalog.
 
@@ -71 +71 @@
 
 @grok.subscribe(ICourse, grok.IObjectAddedEvent)
-def handleCertificateAdd(obj, event):
+def handle_certificate_added(obj, event):
     """Index an added certificate with the local catalog.
 
@@ -86 +86 @@
 
 @grok.subscribe(ICertificateCourse, grok.IObjectAddedEvent)
-def handleCertificateCourseAdd(obj, event):
+def handlecertificatecourse_added(obj, event):
     """Index an added certificatecourse with the local catalog.
 
@@ -101 +101 @@
 
 @grok.subscribe(IDepartment, grok.IObjectRemovedEvent)
-def handleDepartmentRemoval(obj, event):
+def handle_department_removed(obj, event):
     """Clear courses and certificates when a department is killed.
     """

main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py

@@ -97 +97 @@
 
 @grok.subscribe(ICourse, grok.IObjectRemovedEvent)
-def removedCourseHandler(course, event):
+def handle_course_removed(course, event):
     """If a course is deleted, we make sure that also referrers in a
        certificatecontainer are removed.

main/waeup.sirp/trunk/src/waeup/sirp/users.py

@@ -64 +64 @@
 
 @grok.subscribe(Interface, grok.IObjectRemovedEvent)
-def handle_local_roles_on_obj_removal(obj, event):
+def handle_local_roles_on_obj_removed(obj, event):
     try:
         role_map = IPrincipalRoleMap(obj)

main/waeup.sirp/trunk/src/waeup/sirp/utils/logger.py

@@ -343 +343 @@
 
 @grok.subscribe(IDataCenter, IDataCenterStorageMovedEvent)
-def handle_datacenter_storage_move(obj, event):
+def handle_datacenter_storage_moved(obj, event):
     """Event handler, in case datacenter storage moves.
 
@@ -370 +370 @@
 from waeup.sirp.interfaces import IUniversity
 @grok.subscribe(IUniversity, grok.IObjectRemovedEvent)
-def handle_site_removal(obj, event):
+def handle_site_removed(obj, event):
     collector = queryUtility(ILoggerCollector)
     name = getattr(obj, '__name__', None)