Attachment 8026 Details for Bug 42313

[patch] patch (did not consider case insensitivity), attachment 8027 on Bug #42478 is a rewrite

42313-2.patch (text/plain), 982 bytes, created by Florian Best on 2016-09-22 13:28 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-09-22 13:28 CEST

Size: 982 bytes

patch

obsolete

>diff --git a/ucs-school-import/modules/ucsschool/importer/utils/username_handler.py b/ucs-school-import/modules/ucsschool/importer/utils/username_handler.py
>index b30c101..120b618 100644
>--- a/ucs-school-import/modules/ucsschool/importer/utils/username_handler.py
>+++ b/ucs-school-import/modules/ucsschool/importer/utils/username_handler.py
>@@ -42,13 +42,14 @@ from ucsschool.importer.utils.logging import get_logger
> 
> 
> class UsernameHandler(object):
>-	replacement_variable_pattern = re.compile(r"\[.*?\]")
>+
> 	allowed_chars = string.ascii_letters + string.digits + "."
> 
> 	def __init__(self, username_max_length):
> 		self.username_max_length = username_max_length
> 		self.logger = get_logger()
> 		self.connection, self.position = get_admin_connection()
>+		self.replacement_variable_pattern = re.compile(r'\[(%s)\]' % '|'.join(map(re.escape, self.counter_variable_to_function.keys())))
> 
> 	def add_to_ldap(self, username, first_number):
> 		assert isinstance(username, basestring)

Actions: View | Diff

Attachments on bug 42313: 8025 | 8026