throw ValueError instead of TypeError when logarithm doesn't exist

...because attempting to run this with unhashable elements throws the
same exception, which can cause confusion in higher-level algorithms.

Author: yyyyx4

src/sage/groups/additive_abelian/additive_abelian_wrapper.py

@@ -365,7 +365,7 @@ def discrete_log(self, x, gens=None):
             sage: G.discrete_log(V([6, 4]))
             Traceback (most recent call last):
             ...
-            TypeError: Not in group
+            ValueError: not in group
 
         ::
 
@@ -617,7 +617,7 @@ def _base(j, k, c):
             if key in tab:
                 return tab[key] + vector(y)
 
-        raise TypeError('Not in group')
+        raise ValueError('not in group')
 
     def _rec(j, k, c):
 
@@ -744,7 +744,7 @@ def _expand_basis_pgroup(p, alphas, vals, beta, h, rel):
         beta_q *= p
         try:
             e = _discrete_log_pgroup(p, vals, alphas, -beta_q)
-        except TypeError:
+        except ValueError:
             continue
         # step 6
         _expand_basis_pgroup(p, alphas, vals, beta, h, list(e) + [p**v])
@@ -815,7 +815,7 @@ def basis_from_generators(gens, ords=None):
             beta, ord_beta = pgens.pop()
             try:
                 dlog = _discrete_log_pgroup(p, vals, alphas, beta)
-            except TypeError:
+            except ValueError:
                 pass
             else:
                 continue
@@ -828,7 +828,7 @@ def basis_from_generators(gens, ords=None):
 #                assert beta_q == beta * p**v
                 try:
                     e = _discrete_log_pgroup(p, vals, alphas, -beta_q)
-                except TypeError:
+                except ValueError:
                     continue
                 _expand_basis_pgroup(p, alphas, vals, beta, val_beta, list(e) + [p**v])
 #                assert all(a.order() == p**v for a,v in zip(alphas, vals))

src/sage/modules/fg_pid/fgp_module.py

@@ -702,7 +702,7 @@ def __contains__(self, x):
         try:
             self(x)
             return True
-        except TypeError:
+        except (TypeError, ValueError):
             return False
 
     def submodule(self, x):