[Python-checkins] r88513 - python/branches/py3k/Lib/crypt.py

[brett.cannon]

Author: brett.cannon
Date: Tue Feb 22 22:55:51 2011
New Revision: 88513

Log:
A crypt algorithm may not be available by returning None.

Modified:
   python/branches/py3k/Lib/crypt.py

Modified: python/branches/py3k/Lib/crypt.py
==============================================================================
--- python/branches/py3k/Lib/crypt.py	(original)
+++ python/branches/py3k/Lib/crypt.py	Tue Feb 22 22:55:51 2011
@@ -53,5 +53,10 @@
 METHOD_SHA256 = _Method('SHA256', '5', 16, 63)
 METHOD_SHA512 = _Method('SHA512', '6', 16, 106)
 
-methods = [METHOD_SHA512, METHOD_SHA256, METHOD_MD5, METHOD_CRYPT]
-methods[:-1] = [m for m in methods[:-1] if len(crypt('', m)) == m.total_size]
+methods = []
+for _method in (METHOD_SHA512, METHOD_SHA256, METHOD_MD5):
+    _result = crypt('', _method)
+    if _result and len(_result) == _method.total_size:
+        methods.append(_method)
+methods.append(METHOD_CRYPT)
+del _result, _method