Ticket #11346: 11346-followup.patch

File 11346-followup.patch, 1.3 KB (added by robertwb, 9 years ago)
  • sage/schemes/elliptic_curves/ell_number_field.py

    # HG changeset patch
    # User Robert Bradshaw <robertwb@math.washington.edu>
    # Date 1305785876 25200
    # Node ID 2f2904a8f8ae8308937f94e0d7aee387683c0969
    # Parent  38556025a9f56f7a74b3c8423a6d25224a7cd60c
    #11346 - always use integral model for local data.
    
    diff -r 38556025a9f5 -r 2f2904a8f8ae sage/schemes/elliptic_curves/ell_number_field.py
    a b  
    714714            proof = sage.structure.proof.proof.get_flag(None, "number_field")
    715715
    716716        if P is None:
    717             primes = self.base_ring()(self.discriminant()).support()
     717            primes = self.base_ring()(self.integral_model().discriminant()).support()
    718718            return [self._get_local_data(pr, proof) for pr in primes]
    719719
    720720        from sage.schemes.elliptic_curves.ell_local_data import check_prime
     
    12601260        # K==QQ it has to be ZZ.ideal(1).
    12611261        OK = self.base_ring().ring_of_integers()
    12621262        self._conductor = prod([d.prime()**(d.conductor_valuation()) \
    1263                                 for d in self.integral_model().local_data()],\
     1263                                for d in self.local_data()],\
    12641264                               OK.ideal(1))
    12651265        return self._conductor
    12661266