Uploaded image for project: 'Snowstorm'
  1. Snowstorm
  2. STORM-168 Python import cleanup from SNOW-201 only partially present in 2.0
  3. STORM-170

only import python module md5 when module hashlib isn't available

    XMLWordPrintableJSON

Details

    • Task
    • Status: Closed
    • Trivial
    • Resolution: Fixed
    • None
    • Sprint 4
    • None

    Description

      $ ack --python "(import.*md5)|(md5.*import)" -C3
      scripts/install.py
      76-
      77-try:
      78-    # Python 2.6
      79:    from hashlib import md5
      80-except ImportError:
      81-    # Python 2.5 and earlier
      82:    from md5 import new as md5
      83-
      84-from indra.base import llsd
      85-from indra.util import helpformatter
       
      indra/lib/python/indra/base/lluuid.py
      30-import uuid
      31-try:
      32-    # Python 2.6
      33:    from hashlib import md5
      34-except ImportError:
      35-    # Python 2.5 and earlier
      36:    from md5 import new as md5
      37-
      38-def _int2binstr(i,l):
      39-    s=''
       
      indra/lib/python/uuid.py
      474-
      475-def uuid3(namespace, name):
      476-    """Generate a UUID from the MD5 hash of a namespace UUID and a name."""
      477:    import md5
      478-    hash = md5.md5(namespace.bytes + name).digest()
      479-    return UUID(bytes=hash[:16], version=3)
      480-
      

      (only the last file needs fixing)

      Attachments

        Activity

          People

            Unassigned Unassigned
            merov.linden Merov Linden
            Watchers:
            0 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: