Ticket #5059: trac-5059.patch

sage/categories/map.pyx

@@ -52 +52 @@
     cdef _update_slots(self, _slots):
         self._domain = _slots['_domain']
         self._codomain = _slots['_codomain']
-        self._repr_type_str = _slots['_repr_type_str']
+        # Several pickles exist without a _repr_type_str, so
+        # if there is none saved, we just set it to None.
+        if _slots.has_key('_repr_type_str'):
+            self._repr_type_str = _slots['_repr_type_str']
+        else:
+            self._repr_type_str = None
 
     def _test_update_slots(self, _slots):
         self._update_slots(_slots)

sage/modular/all.py

@@ -10 +10 @@
                        kronecker_character, kronecker_character_upside_down,
                        trivial_character)
 
-from congroup import (Gamma0, Gamma1, GammaH, SL2Z,
+from congroup import (Gamma0_constructor as Gamma0,
+                      Gamma1_constructor as Gamma1,
+                      GammaH_constructor as GammaH,
+                      SL2Z,
                       is_CongruenceSubgroup, is_Gamma0, is_Gamma1, is_GammaH, is_SL2Z)
 
 from cusps import Cusp, Cusps

sage/modular/congroup.py

@@ -603 +603 @@
 
 
 _gammaH_cache = {}
-def GammaH(level, H):
+def GammaH_constructor(level, H):
     r"""
     Return the congruence subgroup $\Gamma_H(N)$, which is the subgroup of
     $SL_2(\Z)$ consisting of matrices of the form $\begin{pmatrix} a & b \\
@@ -1364 +1364 @@
     return isinstance(x, Gamma0_class)
 
 _gamma0_cache = {}
-def Gamma0(N):
+def Gamma0_constructor(N):
     """
     Return the congruence subgroup Gamma0(N).
 
@@ -1848 +1848 @@
     return (isinstance(x, Gamma1_class) or is_SL2Z(x))
 
 _gamma1_cache = {}
-def Gamma1(N):
+def Gamma1_constructor(N):
     r"""
     Return the congruence subgroup $\Gamma_1(N)$.
 
@@ -2068 +2068 @@
 import congroup_pyx
 degeneracy_coset_representatives_gamma0 = congroup_pyx.degeneracy_coset_representatives_gamma0
 degeneracy_coset_representatives_gamma1 = congroup_pyx.degeneracy_coset_representatives_gamma1
+
+###########################################################
+# Re-bindings for unpickling
+#
+# Because we have a large number of pickles which were
+# created when Gamma0, Gamma1, etc., were still classes
+# as opposed to functions, we can't unpickle these unless
+# sage.modular.congroup.Gamma0, etc. are classes. So we
+# re-bind these as such below -- note that these bindings
+# are *DIFFERENT* than the bindings for Gamma0, etc. that
+# get imported in all.py.
+#
+# See trac #5059.
+#
+###########################################################
+
+Gamma0 = Gamma0_class
+Gamma1 = Gamma1_class
+GammaH = GammaH_class