[gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/

["André Erdmann" <dywi@mailerd.de>]

commit:     7fafe288511b1b12fd7e18d6ec51e8d1c18f3640
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul  8 22:34:37 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul  8 22:34:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7fafe288

roverlay/digest: try to use hashlib-provided funcs

---
 roverlay/digest.py | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/roverlay/digest.py b/roverlay/digest.py
index a031889..49625ee 100644
--- a/roverlay/digest.py
+++ b/roverlay/digest.py
@@ -14,19 +14,64 @@ __all__ = [
    'whirlpool_file',
 ]
 
-import hashlib
-import portage.util.whirlpool
-
 DEFAULT_BLOCKSIZE=16384
 
+
+import hashlib
+
 _HASH_CREATE_MAP = {
    'md5'       : hashlib.md5,
    'sha1'      : hashlib.sha1,
    'sha256'    : hashlib.sha256,
    'sha512'    : hashlib.sha512,
-   'whirlpool' : portage.util.whirlpool.new,
 }
 
+def hashlib_wrap ( name ):
+   """Creates a wrapper that uses hashlib.new(<name>) for the given name.
+
+   arguments:
+   * name -- hash name, e.g. whirlpool
+   """
+   def wrapped ( *args, **kwargs ):
+      return hashlib.new ( name, *args, **kwargs )
+   # --- end of wrapped (...) ---
+
+   h = hashlib.new
+   wrapped.__dict__.update ( h.__dict__ )
+   wrapped.__name__ = name
+   wrapped.__doc__  = h.__doc__
+   del h
+   return wrapped
+# --- end of hashlib_wrap (...) ---
+
+def hashlib_supports ( name ):
+   """Returns True if the given hash type is supported, else False.
+
+   arguments:
+   * name --
+   """
+   if name in getattr ( hashlib, 'algorithms_available', () ):
+      # python 2's hashlib has no algorithms_available attribute
+      return True
+   else:
+      ret = False
+      try:
+         hashlib.new ( name )
+      except ValueError:
+         pass
+      else:
+         ret = True
+      return ret
+# --- end of hashlib_supports (...) ---
+
+if hashlib_supports ( 'whirlpool' ):
+   _HASH_CREATE_MAP ['whirlpool'] = hashlib_wrap ( "whirlpool" )
+else:
+   import portage.util.whirlpool
+   _HASH_CREATE_MAP ['whirlpool'] = portage.util.whirlpool.new
+
+# -- end of imports / HASH_CREATE_MAP
+
 
 def _generic_obj_hash (
    hashobj, fh, binary_digest=False, blocksize=DEFAULT_BLOCKSIZE