[Python-checkins] r78529 - in python/branches/py3k: Doc/library/hashlib.rst Lib/hashlib.py Lib/test/test_hashlib.py

[gregory.p.smith]

Author: gregory.p.smith
Date: Mon Mar  1 03:05:26 2010
New Revision: 78529

Log:
Merged revisions 78528 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78528 | gregory.p.smith | 2010-02-28 18:01:47 -0800 (Sun, 28 Feb 2010) | 2 lines
  
  Adds the hashlib.algorithms attribute.  See issue7418.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/hashlib.rst
   python/branches/py3k/Lib/hashlib.py
   python/branches/py3k/Lib/test/test_hashlib.py

Modified: python/branches/py3k/Doc/library/hashlib.rst
==============================================================================
--- python/branches/py3k/Doc/library/hashlib.rst	(original)
+++ python/branches/py3k/Doc/library/hashlib.rst	Mon Mar  1 03:05:26 2010
@@ -82,6 +82,15 @@
    >>> h.hexdigest()
    'cc4a5ce1b3df48aec5d22d1f16b894a0b894eccc'
 
+This module provides the following constant attribute:
+
+.. data:: hashlib.algorithms
+
+   A tuple providing the names of the hash algorithms guaranteed to be
+   supported by this module.
+
+   .. versionadded:: 3.2
+
 The following values are provided as constant attributes of the hash objects
 returned by the constructors:
 

Modified: python/branches/py3k/Lib/hashlib.py
==============================================================================
--- python/branches/py3k/Lib/hashlib.py	(original)
+++ python/branches/py3k/Lib/hashlib.py	Mon Mar  1 03:05:26 2010
@@ -57,7 +57,9 @@
 # always available algorithm is added.
 __always_supported = ('md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512')
 
-__all__ = __always_supported + ('new',)
+algorithms = __always_supported
+
+__all__ = __always_supported + ('new', 'algorithms')
 
 
 def __get_builtin_constructor(name):

Modified: python/branches/py3k/Lib/test/test_hashlib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_hashlib.py	(original)
+++ python/branches/py3k/Lib/test/test_hashlib.py	Mon Mar  1 03:05:26 2010
@@ -102,6 +102,11 @@
             c = cons(a)
             c.hexdigest()
 
+    def test_algorithms_attribute(self):
+        self.assertEqual(hashlib.algorithms,
+            tuple(_algo for _algo in self.supported_hash_names
+                  if _algo.islower()))
+
     def test_unknown_hash(self):
         try:
             hashlib.new('spam spam spam spam spam')