Attachment 4996 Details for Bug 30089 – remove.patch

[patch] remove.patch

e2.patch (text/plain), 1.15 KB, created by Florian Best on 2013-01-21 12:21:11 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2013-01-21 12:21:11 CET

Size: 1.15 KB

patch

obsolete

>Index: umc/python/schoolusers/__init__.py
>===================================================================
>--- umc/python/schoolusers/__init__.py	(Revision 38390)
>+++ umc/python/schoolusers/__init__.py	(Arbeitskopie)
>@@ -48,15 +48,6 @@
> 
> _ = Translation( 'ucs-school-umc-schoolusers' ).translate
> 
>-## FIXME: remove in UCS@school 3.2, replace by str(e): Bug #27940, 30089, 30088
>-def get_exception_msg(e):
>-	msg = getattr(e, 'message', '')
>-	if e.args:
>-		if e.args[0] != msg or len(e.args) != 1:
>-			for arg in e.args:
>-				msg += ' %s' % (arg)
>-	return msg
>-
> class Instance( SchoolBaseModule ):
> 	@LDAP_Connection()
> 	def query( self, request, ldap_user_read = None, ldap_position = None, search_base = None ):
>@@ -108,7 +99,7 @@
> 			MODULE.process( '_reset_passwords: dn=%s' % ur.dn )
> 			MODULE.process( '_reset_passwords: exception=%s' % str( e.__class__ ) )
> 			MODULE.process( '_reset_passwords: exception=%s' % str( e.message ) )
>-			return '%s' % (get_exception_msg(e))
>+			return '%s' % (e)
> 
> 	@LDAP_Connection( USER_READ, USER_WRITE )
> 	def password_reset( self, request, ldap_user_read = None, ldap_user_write = None, ldap_position = None, search_base = None ):

Actions: View | Diff

Attachments on bug 30089: 4996