projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog
[mirror/userdir-ldap.git]
/
ud-useradd
diff --git
a/ud-useradd
b/ud-useradd
index
62e4f4d
..
2f24201
100755
(executable)
--- a/
ud-useradd
+++ b/
ud-useradd
@@
-20,9
+20,7
@@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
import re, time, ldap, getopt, sys, os, pwd;
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
import re, time, ldap, getopt, sys, os, pwd;
-import email
-import email.base64mime
-import email.quoprimime
+import email.Header
from userdir_ldap import *;
from userdir_gpg import *;
from userdir_ldap import *;
from userdir_gpg import *;
@@
-237,25
+235,18
@@
if Res != "yes":
# Initialize the substitution Map
Subst = {}
# Initialize the substitution Map
Subst = {}
-emailstring = FullName + " " + emailaddr
encto = ''
try:
encto = ''
try:
- encto = emailstring.encode('us-ascii')
-except UnicodeDecodeError:
- if email.base64mime.base64_len(emailstring) < email.quoprimime.header_quopri_len(emailstring):
- encto = email.base64mime.header_encode(emailstring, 'us-ascii')
- else:
- encto = email.quoprimime.header_encode(emailstring, 'us-ascii')
+ encto = FullName.decode('us-ascii')
+except UnicodeError:
+ encto = email.Header.Header(FullName, 'utf-8', 200) + " " + emailaddr
subjstring = "New Debian Maintainer " + FullName
encsubj = ''
try:
subjstring = "New Debian Maintainer " + FullName
encsubj = ''
try:
- encsubj = subjstring.encode('us-ascii')
-except UnicodeDecodeError:
- if email.base64mime.base64_len(subjstring) < email.quoprimime.header_quopri_len(subjstring):
- encsubj = email.base64mime.header_encode(subjstring, 'us-ascii')
- else:
- encsubj = email.quoprimime.header_encode(subjstring, 'us-ascii')
+ encsubj = subjstring.decode('us-ascii')
+except UnicodeError:
+ encsubj = email.Header.Header(subjstring, 'utf-8', 200)
Subst["__HEADER_SUBJ__"] = encsubj
Subst["__HEADER_EMAIL"] = encto
Subst["__HEADER_SUBJ__"] = encsubj
Subst["__HEADER_EMAIL"] = encto