# HG changeset patch
# Parent 582fb4a0e74cc316b447b409af49d0fe0926cb14
Some rather trivial doctest fixes: Signs changed somehow between sage-5 and sage-6

diff --git a/src/pGroupCohomology/cochain.pyx b/src/pGroupCohomology/cochain.pyx
--- a/src/pGroupCohomology/cochain.pyx
+++ b/src/pGroupCohomology/cochain.pyx
@@ -1815,11 +1815,11 @@
             sage: U.element_as_polynomial(r1(C))
             0: 3-Cocycle in H^*(SmallGroup(9,2); GF(3))
             sage: U.element_as_polynomial(r2(C))
-            c_2_2*a_1_0-c_2_1*a_1_1: 3-Cocycle in H^*(SmallGroup(9,2); GF(3))
+            -c_2_2*a_1_0+c_2_1*a_1_1: 3-Cocycle in H^*(SmallGroup(9,2); GF(3))
             sage: U.element_as_polynomial(r3(C))
-            c_2_2*a_1_0-c_2_1*a_1_1: 3-Cocycle in H^*(SmallGroup(9,2); GF(3))
+            -c_2_2*a_1_0+c_2_1*a_1_1: 3-Cocycle in H^*(SmallGroup(9,2); GF(3))
             sage: U.element_as_polynomial(r4(C))
-            c_2_2*a_1_1+c_2_2*a_1_0-c_2_1*a_1_1: 3-Cocycle in H^*(SmallGroup(9,2); GF(3))
+            c_2_2*a_1_1-c_2_2*a_1_0+c_2_1*a_1_1: 3-Cocycle in H^*(SmallGroup(9,2); GF(3))
 
         Hence, after computing Bockstein and Steenrod power in ``U`` as above, and since
         Steenrod power and Bockstein commute with restriction maps, the theorem of Kraines
@@ -1829,13 +1829,13 @@
 
             sage: CP = C.massey_power()
             sage: U.element_as_polynomial(r1(CP))
-            0: 8-Cocycle in H^*(SmallGroup(9,2); GF(3))
+            0: 8-Cocc = A.element_as_polynomial(a); cycle in H^*(SmallGroup(9,2); GF(3))
             sage: U.element_as_polynomial(r2(CP))
-            -c_2_1*c_2_2^3+c_2_1^3*c_2_2: 8-Cocycle in H^*(SmallGroup(9,2); GF(3))
+            c_2_1*c_2_2^3-c_2_1^3*c_2_2: 8-Cocycle in H^*(SmallGroup(9,2); GF(3))
             sage: U.element_as_polynomial(r3(CP))
-            -c_2_1*c_2_2^3+c_2_1^3*c_2_2: 8-Cocycle in H^*(SmallGroup(9,2); GF(3))
+            c_2_1*c_2_2^3-c_2_1^3*c_2_2: 8-Cocycle in H^*(SmallGroup(9,2); GF(3))
             sage: U.element_as_polynomial(r4(CP))
-            -c_2_2^4-c_2_1*c_2_2^3+c_2_1^3*c_2_2: 8-Cocycle in H^*(SmallGroup(9,2); GF(3))
+            -c_2_2^4+c_2_1*c_2_2^3-c_2_1^3*c_2_2: 8-Cocycle in H^*(SmallGroup(9,2); GF(3))
            
         It is known that for this group, a cocycle is uniquely determined by its restrictions
         to the maximal elementary abelian subgroups. Hence, we have verified the computation
@@ -6792,7 +6792,10 @@
         else: # we just want to return the preimage ideal
             OutItem = None
         DoS.set_ring()
-        PreIm = singular.ideal([RTotal.imap(p) for p in Out] or 0).interred() #groebner()
+        if Out:
+            PreIm = singular.ideal([RTotal.imap(p) for p in Out]).interred() #groebner()
+        else:
+            PreIm = singular.ideal(0)
         singular.eval('degBound='+dgb)
         if OutItem is None:
             return PreIm
diff --git a/src/pGroupCohomology/cohomology.pyx b/src/pGroupCohomology/cohomology.pyx
--- a/src/pGroupCohomology/cohomology.pyx
+++ b/src/pGroupCohomology/cohomology.pyx
@@ -306,12 +306,14 @@
         return G
     if isinstance(G, GapPickler):
         return gap(G.value)
+    if not isinstance(G, (dict,tuple,list)):
+        return G
+    if isinstance(G,dict):
+        return dict((unpickle_gap_data(k, gap), unpickle_gap_data(v, gap)) for k,v in G.iteritems())
     try:
         I = iter(G)
     except:
         return G
-    if isinstance(G,dict):
-        return dict((unpickle_gap_data(k, gap), unpickle_gap_data(v, gap)) for k,v in G.iteritems())
     return type(G)(unpickle_gap_data(X, gap) for X in I)
 
 
@@ -7353,18 +7355,19 @@
         generator of ``H`` is non-zero, but is contained in the
         nil radical::
         
-            sage: print r(H.3)
+            sage: a = r(H.3); a.normalize()
+            sage: print a
             2-Cocycle in H^*(SmallGroup(9,2); GF(3)),
             represented by
             [1 0 0]
-            sage: print A.nil_reduce(r(H.3))
+            sage: print A.nil_reduce(a)
             [0, 0, 0]
 
         We verify that ``r(H.3)`` really belongs to the nil
         radical by expressing it as a product of nilpotent
         generators of ``A``::
         
-            sage: A.element_as_polynomial(r*H.3)
+            sage: c = A.element_as_polynomial(a); c
             -a_1_0*a_1_1: 2-Cocycle in H^*(SmallGroup(9,2); GF(3))
             
         """
diff --git a/src/pGroupCohomology/modular_cohomology.pyx b/src/pGroupCohomology/modular_cohomology.pyx
--- a/src/pGroupCohomology/modular_cohomology.pyx
+++ b/src/pGroupCohomology/modular_cohomology.pyx
@@ -2713,8 +2713,8 @@
 
             sage: p = H.poincare_series()
             sage: t = p.parent().gen()
-            sage: (p*(1-t^4)*(1-t^12)*(1-t^2)*(1-t)).denominator()
-            -t^6 + 2*t^3 - 1
+            sage: (p*(1-t^4)*(1-t^12)*(1-t^2)*(1-t)).denominator().monic()
+            t^6 - 2*t^3 + 1
 
         Let us continue the computation step by step. Of course, normally we
         would just do ``H.make()`` instead. ::
