Ticket #2347: 2347-7.patch

File 2347-7.patch, 1.7 KB (added by robertwb, 14 years ago)
  • sage/calculus/calculus.py

    # HG changeset patch
    # User Robert Bradshaw <robertwb@math.washington.edu>
    # Date 1207912080 25200
    # Node ID 55d42eeab157810f600432fe0226b75ebec20d3a
    # Parent  dd1dddfd7b4f0e59db8030450a53bb88920f045e
    a couple more tweaks
    
    diff -r dd1dddfd7b4f -r 55d42eeab157 sage/calculus/calculus.py
    a b def _find_var(name): 
    82798279        pass
    82808280    try:
    82818281        return SR(sage.all.__dict__[name])
    8282     except KeyError:
     8282    except (KeyError, TypeError):
    82838283        return var(name)
    82848284       
    82858285def _find_func(name):
    def _find_func(name): 
    82938293        func = SR(sage.all.__dict__[name])
    82948294        if not isinstance(func, (SymbolicConstant, SymbolicVariable)):
    82958295            return func
    8296     except KeyError:
     8296    except (KeyError, TypeError):
    82978297        return function(name)
    82988298
    82998299SR_parser = Parser(make_int      = lambda x: SymbolicConstant(Integer(x)),
  • sage/rings/complex_double.pyx

    diff -r dd1dddfd7b4f -r 55d42eeab157 sage/rings/complex_double.pyx
    a b cdef extern from "math.h": 
    6464   
    6565cdef extern from "stdsage.h":
    6666    void set_gel(GEN x, long n, GEN z)
    67 
    68 from sage.misc.sage_eval import sage_eval
    6967
    7068cimport sage.rings.ring
    7169
  • sage/rings/real_double.pyx

    diff -r dd1dddfd7b4f -r 55d42eeab157 sage/rings/real_double.pyx
    a b import math, operator 
    3232
    3333cimport sage.libs.pari.gen
    3434import sage.libs.pari.gen
    35 
    36 from sage.misc.sage_eval import sage_eval
    3735
    3836import sage.rings.complex_double
    3937import sage.rings.complex_field