Merge pull request #14 from dhondta/copilot/add-brew-install-option

Fix crash on import when libcrypt/libxcrypt is missing

Author: dhondta

src/codext/hashing/crypt.py

@@ -15,18 +15,22 @@
     try:
         import crypt
     except ImportError:
-        import legacycrypt as crypt
+        try:
+            import legacycrypt as crypt
+        except ImportError:
+            crypt = None
 
-    METHODS = [x[7:].lower() for x in crypt.__dict__ if x.startswith("METHOD_")]
-    
-    def crypt_hash(method):
-        method = (method or "").lstrip("-_") or "blowfish"
-        if method not in METHODS:
-            raise NotImplementedError("method '%s' is not implemented" % method)
-        def _encode(input, error="strict"):
-            m = getattr(crypt, "METHOD_" + method.upper())
-            return crypt.crypt(ensure_str(input), crypt.mksalt(m)), len(input)
-        return _encode
-    
-    add("crypt", crypt_hash, pattern=r"^crypt(|[-_](?:%s))$" % "|".join(METHODS), guess=None)
+    if crypt is not None:
+        METHODS = [x[7:].lower() for x in crypt.__dict__ if x.startswith("METHOD_")]
+        
+        def crypt_hash(method):
+            method = (method or "").lstrip("-_") or "blowfish"
+            if method not in METHODS:
+                raise NotImplementedError("method '%s' is not implemented" % method)
+            def _encode(input, error="strict"):
+                m = getattr(crypt, "METHOD_" + method.upper())
+                return crypt.crypt(ensure_str(input), crypt.mksalt(m)), len(input)
+            return _encode
+        
+        add("crypt", crypt_hash, pattern=r"^crypt(|[-_](?:%s))$" % "|".join(METHODS), guess=None)
 

tests/test_manual.py

@@ -128,8 +128,12 @@ def test_codec_hash_functions(self):
             try:
                 import crypt
             except ImportError:
-                import legacycrypt as crypt
-            METHODS = [x[7:].lower() for x in crypt.__dict__ if x.startswith("METHOD_")]
+                try:
+                    import legacycrypt as crypt
+                except ImportError:
+                    crypt = None
+            METHODS = [x[7:].lower() for x in crypt.__dict__ if x.startswith("METHOD_")] \
+                      if crypt is not None else []
             for m in METHODS:
                 h = "crypt-" + m
                 self.assertIsNotNone(codecs.encode(STR, h))