projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cast objects to strings (rt #1717)
[mirror/userdir-ldap.git]
/
ud-useradd
diff --git
a/ud-useradd
b/ud-useradd
index
25fd604
..
2ff63a3
100755
(executable)
--- a/
ud-useradd
+++ b/
ud-useradd
@@
-241,14
+241,14
@@
encto = ''
try:
encto = FullName.decode('us-ascii')
except UnicodeError:
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:
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
Subst["__HEADER_SUBJ__"] = encsubj
Subst["__HEADER_EMAIL"] = encto