comparison easyhg.py @ 445:ff6252986354

Minor fixes from OS/X test
author Chris Cannam
date Tue, 28 Jun 2011 16:22:42 +0100
parents 66ec8b2ee946
children f72cad3baa34
comparison
equal deleted inserted replaced
444:66ec8b2ee946 445:ff6252986354
56 try: 56 try:
57 from Crypto.Cipher import AES 57 from Crypto.Cipher import AES
58 import ConfigParser # Mercurial version won't write files 58 import ConfigParser # Mercurial version won't write files
59 import base64 59 import base64
60 except ImportError: 60 except ImportError:
61 print "EasyHg: Failed to import required modules for authfile support"
61 easyhg_authfile_imports_ok = False 62 easyhg_authfile_imports_ok = False
62 63
63 64
64 def encrypt_salted(text, key): 65 def encrypt_salted(text, key):
65 salt = os.urandom(8) 66 salt = os.urandom(8)