Ticket #9958: 9958_misc.patch

File 9958_misc.patch, 1.6 KB (added by jdemeyer, 9 years ago)
  • sage/misc/cython.py

    # HG changeset patch
    # User Jeroen Demeyer <jdemeyer@cage.ugent.be>
    # Date 1325776255 -3600
    # Node ID b00edf35646428b667d133d95439c127427d4e2f
    # Parent  8658d6b3c901d9cdeeb0acfafb7860c4ea0061e8
    Various misc fixes for Python-2.7
    
    diff --git a/sage/misc/cython.py b/sage/misc/cython.py
    a b  
    173173        'csage'],
    174174        ['.../local/include/csage/',
    175175        '.../local/include/',
    176         '.../local/include/python2.6/',
    177         '.../local/lib/python2.6/site-packages/numpy/core/include',
     176        '.../local/include/python2.7/',
     177        '.../local/lib/python2.7/site-packages/numpy/core/include',
    178178        '.../devel/sage/sage/ext/',
    179179        '.../devel/sage/',
    180180        '.../devel/sage/sage/gsl/'],
     
    201201        ['bar',
    202202        '.../local/include/csage/',
    203203        '.../local/include/',
    204         '.../local/include/python2.6/',
    205         '.../local/lib/python2.6/site-packages/numpy/core/include',
     204        '.../local/include/python2.7/',
     205        '.../local/lib/python2.7/site-packages/numpy/core/include',
    206206        '.../devel/sage/sage/ext/',
    207207        '.../devel/sage/',
    208208        '.../devel/sage/sage/gsl/']
  • sage/misc/lazy_import.pyx

    diff --git a/sage/misc/lazy_import.pyx b/sage/misc/lazy_import.pyx
    a b  
    389389            sage: type(version_info)
    390390            <type 'sage.misc.lazy_import.LazyImport'>
    391391            sage: iter(version_info)
    392             <tupleiterator object at ...>
     392            <iterator object at ...>
    393393        """
    394394        return iter(self._get_object())
    395395