HtmlSanitizer becomes Python 2.6 compatible.
The Cleaner class must not have any arguments when calling __init__ function for the object class, because in this case Python 2.6 raises TypeError (while previous versions just ignored them).
#!/usr/bin/python2.5
#
# Copyright 2009 the Melange authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
"""GHOP module cleaning methods.
"""
__authors__ = [
'"Madhusudan.C.S" <madhusudancs@gmail.com>',
]
from django import forms
from django.utils.translation import ugettext
from soc.logic import cleaning
from soc.logic import validate
def cleanTaskComment(comment_field, action_field, ws_field):
"""Cleans the comment form and checks to see if there is either
action or comment content.
Raises ValidationError if:
-There is no action taking place and no comment present
-The action is needs_review and there is no comment or work submission
present
"""
def wrapper(self):
"""Decorator wrapper method.
"""
cleaned_data = self.cleaned_data
content = cleaned_data.get(comment_field)
action = cleaned_data.get(action_field)
work_submission = cleaned_data.get(ws_field)
if action == 'noaction' and not content:
raise forms.ValidationError(
ugettext('You cannot have comment field empty with no action.'))
if action == 'needs_review' and not content and not work_submission:
raise forms.ValidationError(
ugettext('You cannot have both comment field and work '
'submission fields empty.'))
return cleaned_data
return wrapper
def cleanMentorsList(field_name):
"""Clean method to check and validate list of mentor's link_ids.
"""
@cleaning.check_field_is_empty(field_name)
def wrapper(self):
"""Decorator wrapped method.
"""
from soc.modules.ghop.logic.models.mentor import logic as ghop_mentor_logic
mentors_list_str = cleaning.str2set(field_name)(self)
filter = {
'scope_path': self.cleaned_data.get('scope_path'),
'status': 'active'
}
mentors_list = []
for link_id in mentors_list_str:
if not validate.isLinkIdFormatValid(link_id):
raise forms.ValidationError(
"%s is not a valid link ID." % link_id)
filter['link_id'] = link_id
if not ghop_mentor_logic.getFromKeyFields(filter):
raise forms.ValidationError(
'link_id "%s" is not a valid Mentor.' % link_id)
mentors_list.append(link_id)
return mentors_list
return wrapper