py_tasks_melange: comparison app/soc/logic/cleaning.py

equal deleted inserted replaced

-:45f4e9cd9100
+:106a5a7834d0
 """
 from functools import wraps
 @wraps(fun)
 def wrapper(self):
+"""Decorator wrapper method.
+"""
 field_content = self.cleaned_data.get(field_name)
 if not field_content:
 # field has no content so bail out
 return None
 """Incorperates the check_field_is_empty as regular cleaner.
 """
 @check_field_is_empty(field_name)
 def wrapper(self):
+"""Decorator wrapper method.
+"""
 return self.cleaned_data.get(field_name)
 return wrapper
 """Checks if the field_name value is in a valid link ID format.
 """
 @check_field_is_empty(field_name)
 def wrapper(self):
+"""Decorator wrapper method.
+"""
 # convert to lowercase for user comfort
 link_id = self.cleaned_data.get(field_name).lower()
 if not validate.isLinkIdFormatValid(link_id):
 raise forms.ValidationError("This link ID is in wrong format.")
 return link_id
 """Checks if the field_name value is in a valid scope path format.
 """
 @check_field_is_empty(field_name)
 def wrapper(self):
+"""Decorator wrapper method.
+"""
 # convert to lowercase for user comfort
 scope_path = self.cleaned_data.get(field_name).lower()
 if not validate.isScopePathFormatValid(scope_path):
 raise forms.ValidationError("This scope path is in wrong format.")
 return scope_path
 the field_name field false.
 """
 @check_field_is_empty(field_name)
 def wrapper(self):
+"""Decorator wrapper method.
+"""
 agrees_to_tos = self.cleaned_data.get(field_name)
 if not site_logic.logic.getToS(site_logic.logic.getSingleton()):
 return agrees_to_tos
 """Check if the field_name field is a valid user.
 """
 @check_field_is_empty(field_name)
 def wrapped(self):
+"""Decorator wrapper method.
+"""
 link_id = clean_link_id(field_name)(self)
 user_entity = user_logic.logic.getForFields({'link_id': link_id},
 unique=True)
 current user.
 """
 @check_field_is_empty(field_name)
 def wrapped(self):
+"""Decorator wrapper method.
+"""
 link_id = clean_link_id(field_name)(self)
 user_entity = user_logic.logic.getForCurrentAccount()
 if not user_entity or user_entity.link_id != link_id:
 link id does not exist.
 """
 @check_field_is_empty(field_name)
 def wrapped(self):
+"""Decorator wrapper method.
+"""
 link_id = clean_link_id(field_name)(self)
 user_entity = user_logic.logic.getForFields({'link_id': link_id},
 unique=True)
 equal to the current user.
 """
 @check_field_is_empty(field_name)
 def wrapped(self):
+"""Decorator wrapper method.
+"""
 clean_user_field = clean_existing_user(field_name)
 user_entity = clean_user_field(self)
 current_user_entity = user_logic.logic.getForCurrentAccount()
 """Returns the User with the given field_name value.
 """
 @check_field_is_empty(field_name)
 def wrapped(self):
+"""Decorator wrapper method.
+"""
 email_adress = self.cleaned_data[field_name]
 return users.User(email_adress)
 return wrapped
 address that hasn't been used for an existing account.
 """
 @check_field_is_empty(field_name)
 def wrapped(self):
+"""Decorator wrapper method.
+"""
 email_adress = self.cleaned_data.get(field_name).lower()
 # get the user account for this email and check if it's in use
 user_account = users.User(email_adress)
 fields = {'account': user_account}
 user_entity = user_logic.logic.getForFields(fields, unique=True)
 if user_entity or user_logic.logic.isFormerAccount(user_account):
-raise forms.ValidationError("There is already a user with this email adress.")
+raise forms.ValidationError("There is already a user "
+"with this email adress.")
 return user_account
 return wrapped
 def clean_feed_url(self):
+"""Clean method for cleaning feed url.
+"""
 feed_url = self.cleaned_data.get('feed_url')
 if feed_url == '':
 # feed url not supplied (which is OK), so do not try to validate it
 return None
 return feed_url
 def clean_document_content(self):
+"""Clean method for cleaning document content.
+"""
 content = self.cleaned_data.get('content')
 sanitizer = feedparser._HTMLSanitizer('utf-8')
 sanitizer.feed(content)
 content = sanitizer.output()
 """Clean method for cleaning a field belonging to a LinkProperty.
 """
 @check_field_is_empty(field_name)
 def wrapped(self):
+"""Decorator wrapper method.
+"""
 value = self.cleaned_data.get(field_name)
-# call the Django URLField cleaning method to properly clean/validate this field
+# call the Django URLField cleaning method to
+# properly clean/validate this field
 return forms.URLField.clean(self.fields[field_name], value)
 return wrapped
 def validate_user_edit(link_id_field, account_field):
 -Another User has the given email address as account
 -Another User has the given email address in it's FormerAccounts list
 """
 def wrapper(self):
+"""Decorator wrapper method.
+"""
 cleaned_data = self.cleaned_data
 link_id = cleaned_data.get(link_id_field)
 user_account = cleaned_data.get(account_field)
 fields = {'account': user_account}
 user_from_account_entity = user_logic.logic.getForFields(fields,
 unique=True)
 # if there is a user with the given account or it's a former account
-if user_from_account_entity or user_logic.logic.isFormerAccount(user_account):
+if user_from_account_entity or \
+user_logic.logic.isFormerAccount(user_account):
 # raise an error because this email address can't be used
-raise forms.ValidationError("There is already a user with this email address.")
+raise forms.ValidationError("There is already a user with "
+"this email address.")
 return cleaned_data
 return wrapper
 -A application with this link id and scope path already exists
 -A group with this link id and scope path already exists
 """
 def wrapper(self):
-cleaned_data = self.cleaned_data
+"""Decorator wrapper method.
+"""
-fields = {}
+cleaned_data = self.cleaned_data
-link_id = cleaned_data.get(link_id_field)
+fields = {}
-if link_id:
+link_id = cleaned_data.get(link_id_field)
-fields['link_id'] = link_id
+if link_id:
-scope_path = cleaned_data.get(scope_path_field)
+fields['link_id'] = link_id
-if scope_path:
-fields['scope_path'] = scope_path
+scope_path = cleaned_data.get(scope_path_field)
+if scope_path:
-# get the application
+fields['scope_path'] = scope_path
-group_app_entity = group_app_logic.logic.getForFields(fields, unique=True)
+# get the application
-# get the current user
+group_app_entity = group_app_logic.logic.getForFields(fields, unique=True)
-user_entity = user_logic.logic.getForCurrentAccount()
+# get the current user
-# make sure it's not the applicant creating the new group
+user_entity = user_logic.logic.getForCurrentAccount()
-if group_app_entity and (
-group_app_entity.applicant.key() != user_entity.key()):
+# make sure it's not the applicant creating the new group
-# add the error message to the link id field
+if group_app_entity and (
-self._errors[link_id_field] = ErrorList([DEF_LINK_ID_IN_USE_MSG])
+group_app_entity.applicant.key() != user_entity.key()):
-del cleaned_data[link_id_field]
+# add the error message to the link id field
-# return the new cleaned_data
+self._errors[link_id_field] = ErrorList([DEF_LINK_ID_IN_USE_MSG])
-return cleaned_data
+del cleaned_data[link_id_field]
+# return the new cleaned_data
-# check if there is already a group for the given fields
+return cleaned_data
-group_entity = group_logic.logic.getForFields(fields, unique=True)
+# check if there is already a group for the given fields
-if group_entity:
+group_entity = group_logic.logic.getForFields(fields, unique=True)
-# add the error message to the link id field
-self._errors[link_id_field] = ErrorList([DEF_LINK_ID_IN_USE_MSG])
+if group_entity:
-del cleaned_data[link_id_field]
+# add the error message to the link id field
-# return the new cleaned_data
+self._errors[link_id_field] = ErrorList([DEF_LINK_ID_IN_USE_MSG])
-return cleaned_data
+del cleaned_data[link_id_field]
+# return the new cleaned_data
 return cleaned_data
+return cleaned_data
 return wrapper
 def validate_student_proposal(org_field, scope_field,
 student_logic, org_logic):
 """Validates the form of a student proposal.
 -The organization link_id does not match an active organization
 -The hidden scope path is not a valid active student
 """
 def wrapper(self):
+"""Decorator wrapper method.
+"""
 cleaned_data = self.cleaned_data
 org_link_id = cleaned_data.get(org_field)
 scope_path = cleaned_data.get(scope_field)
 def validate_document_acl(view):
 """Validates that the document ACL settings are correct.
 """
 def wrapper(self):
+"""Decorator wrapper method.
+"""
 cleaned_data = self.cleaned_data
 read_access = cleaned_data.get('read_access')
 write_access = cleaned_data.get('write_access')
 if not (read_access and write_access and ('prefix' in cleaned_data)):

changeset 1621	106a5a7834d0
parent 1522	983b126f5aca
child 1680	fbf8101f6eff