← Back to branch summary

~msapiro/mailman/topics

« back to all changes in this revision

Viewing changes to Mailman/Utils.py

  • Committer: Mark Sapiro
  • Date: 2008-12-03 19:44:51 UTC
  • mfrom: (1006.1.11 2.2)
  • Revision ID: mark@msapiro.net-20081203194451-fjqije6crun7iajf
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Mailman/Utils.py
27
27
from __future__ import nested_scopes
28
28
 
29
29
import os
 
30
import sys
30
31
import re
31
32
import cgi
32
 
import sha
33
33
import time
34
34
import errno
35
35
import base64
56
56
from Mailman.Logging.Syslog import syslog
57
57
 
58
58
try:
 
59
    import hashlib
 
60
    md5_new = hashlib.md5
 
61
    sha_new = hashlib.sha1
 
62
except ImportError:
 
63
    import md5
 
64
    import sha
 
65
    md5_new = md5.new
 
66
    sha_new = sha.new
 
67
 
 
68
try:
59
69
    True, False
60
70
except NameError:
61
71
    True = 1
385
395
    omask = os.umask(026)
386
396
    try:
387
397
        fp = open(filename, 'w')
388
 
        fp.write(sha.new(pw).hexdigest() + '\n')
 
398
        fp.write(sha_new(pw).hexdigest() + '\n')
389
399
        fp.close()
390
400
    finally:
391
401
        os.umask(omask)
411
421
    challenge = get_global_password(siteadmin)
412
422
    if challenge is None:
413
423
        return None
414
 
    return challenge == sha.new(response).hexdigest()
 
424
    return challenge == sha_new(response).hexdigest()
415
425
 
416
426
 
417
427
 
1090
1100
        return True
1091
1101
    else:
1092
1102
        return False
 
1103