From: Stephen Gran <steve@lobefin.net>
Date: Tue, 25 Aug 2009 14:50:32 +0000 (+0100)
Subject: cast objects to strings (rt #1717)
X-Git-Tag: userdir-ldap-0.3.72~8^2~1
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=30dc47cd5d9fda4ec6e48d8b8b3b200931ba5003

cast objects to strings (rt #1717)

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/ud-useradd b/ud-useradd
index 25fd604..2ff63a3 100755
--- a/ud-useradd
+++ b/ud-useradd
@@ -241,14 +241,14 @@ encto = ''
 try:
   encto = FullName.decode('us-ascii')
 except UnicodeError:
-  encto = email.Header.Header(FullName, 'utf-8', 200) + " " + emailaddr
+  encto = str(email.Header.Header(FullName, 'utf-8', 200)) + " " + emailaddr
 
 subjstring = "New Debian Maintainer " + FullName
 encsubj = ''
 try:
   encsubj = subjstring.decode('us-ascii')
 except UnicodeError:
-  encsubj = email.Header.Header(subjstring, 'utf-8', 200)
+  encsubj = str(email.Header.Header(subjstring, 'utf-8', 200))
 
 Subst["__HEADER_SUBJ__"] = encsubj
 Subst["__HEADER_EMAIL"] = encto