From 2ac6267c3ace0f0f64aa3e10379028bda24cdd52 2011-11-19 02:23:26
From: Stefan van der Walt <stefan@sun.ac.za>
Date: 2011-11-19 02:23:26
Subject: [PATCH] Try to get password from user three times.

---

diff --git a/IPython/lib/security.py b/IPython/lib/security.py
index 059cd1c..e7c444b 100644
--- a/IPython/lib/security.py
+++ b/IPython/lib/security.py
@@ -10,7 +10,7 @@ import getpass
 # bits of randomness.
 salt_len = 12
 
-def passwd(passphrase='', algorithm='sha1'):
+def passwd(passphrase=None, algorithm='sha1'):
     """Generate hashed password and salt for use in notebook configuration.
 
     In the notebook configuration, set `c.NotebookApp.password` to
@@ -36,13 +36,17 @@ def passwd(passphrase='', algorithm='sha1'):
     Out[1]: 'sha1:7cf3:b7d6da294ea9592a9480c8f52e63cd42cfb9dd12'
 
     """
-    if not passphrase:
-        p0 = getpass.getpass('Enter password: ')
-        p1 = getpass.getpass('Verify password: ')
-        if (p0 == p1):
-            passphrase = p0
+    if passphrase is None:
+        for i in range(3):
+            p0 = getpass.getpass('Enter password: ')
+            p1 = getpass.getpass('Verify password: ')
+            if p0 == p1:
+                passphrase = p0
+                break
+            else:
+                print('Passwords do not match.')
         else:
-            raise ValueError('Passwords did not match.')
+            raise ValueError('No matching passwords found. Giving up.')
 
     h = hashlib.new(algorithm)
     salt = ('%0' + str(salt_len) + 'x') % random.getrandbits(4 * salt_len)