Attachment 6027 Details for Bug 23289 – encoding.patch

[patch] encoding.patch

encoding.patch (text/plain), 2.91 KB, created by Arvid Requate on 2014-07-29 09:36:18 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2014-07-29 09:36:18 CEST

Size: 2.91 KB

patch

obsolete

>Index: univention-adsearch
>===================================================================
>--- univention-adsearch	(Revision 52302)
>+++ univention-adsearch	(Arbeitskopie)
>@@ -40,6 +40,8 @@
> import ldap.sasl
> import subprocess
> import string
>+import locale
>+default_encoding = locale.getdefaultlocale()[1]
> 
> class kerberosAuthenticationFailed(Exception): pass
> 
>@@ -109,7 +111,7 @@
>     print "ERROR: no filter given"
>     usage()
>     sys.exit(1)
>-filter_tmp = sys.argv[oiterator].decode('latin')
>+filter_tmp = sys.argv[oiterator].decode(default_encoding)
> 
> if len(sys.argv) > oiterator+1:
>     filter_attributes = sys.argv[oiterator+1].split(',')
>@@ -232,7 +234,7 @@
> 
> print "#"
> print "# univention-adsearch"
>-print "# filter: %s" % filter.encode('latin')
>+print "# filter: %s" % filter.encode(default_encoding)
> print "#"
> 
> for r in res:
>@@ -240,7 +242,7 @@
> 		n_referrals += 1
> 		continue
> 	print ""
>-	print "%s: %s"%('DN',unicode(r[0],'utf8').encode('latin'))
>+	print "%s: %s"%('DN',unicode(r[0],'utf8').encode(default_encoding))
> 	for key in r[1]:
> 		if key in ["objectGUID",'ipsecData','repsFrom','replUpToDateVector']:
> 			print "%s: %s"%(key,r[1][key])
>@@ -261,7 +263,7 @@
> 				print "%s: %s"%(key,sid)		
> 			else:
> 				try:
>-					print "%s: %s"%(key,unicode(val,'utf8').encode('latin'))
>+					print "%s: %s"%(key,unicode(val,'utf8').encode(default_encoding))
> 				except:
> 					print "failed: %s"%key
> 
>Index: univention-connector-list-rejected
>===================================================================
>--- univention-connector-list-rejected	(Revision 52302)
>+++ univention-connector-list-rejected	(Arbeitskopie)
>@@ -38,8 +38,9 @@
> import univention
> import univention.connector
> import univention.connector.ad
>-
> import univention.config_registry
>+import locale
>+default_encoding = locale.getdefaultlocale()[1]
> 
> CONFIGBASENAME="connector"
> 
>@@ -155,8 +156,8 @@
> 	print "\n\tUCS rejected\n"
> 	for filename,dn in ad.list_rejected_ucs():
> 		found_rejected = True
>-		print "%5d:   UCS DN: %s" % (i, univention.connector.ad.encode_attrib(dn).encode('latin'))
>-		ad_dn = univention.connector.ad.encode_attrib(ad.get_dn_by_ucs(dn)).encode('latin')
>+		print "%5d:   UCS DN: %s" % (i, univention.connector.ad.encode_attrib(dn).encode(default_encoding))
>+		ad_dn = univention.connector.ad.encode_attrib(ad.get_dn_by_ucs(dn)).encode(default_encoding)
> 		if ad_dn:
> 			print "          AD DN: %s" % ad_dn
> 		else:
>@@ -168,8 +169,8 @@
> 	print "\nAD rejected\n"
> 	for id,dn in ad.list_rejected():
> 		found_rejected = True
>-		print "%5d:    AD DN: %s" % (i,univention.connector.ad.encode_attrib(dn).encode('latin'))
>-		ucs_dn = univention.connector.ad.encode_attrib(ad.get_dn_by_con(dn)).encode('latin')
>+		print "%5d:    AD DN: %s" % (i,univention.connector.ad.encode_attrib(dn).encode(default_encoding))
>+		ucs_dn = univention.connector.ad.encode_attrib(ad.get_dn_by_con(dn)).encode(default_encoding)
> 		if ucs_dn:
> 			print "         UCS DN: %s" % ucs_dn
> 		else:

Actions: View | Diff

Attachments on bug 23289: 3841 | 6027