Ticket #14706: 14706_R_3.0.1.patch

File 14706_R_3.0.1.patch, 1.6 KB (added by jdemeyer, 8 years ago)
  • sage/interfaces/r.py

    # HG changeset patch
    # User Emmanuel Charpentier <emm.charpentier@free.fr>
    # Date 1370719466 -7200
    # Node ID 7e501d2dfb86aeaa0dd64c893820d89140bd409d
    # Parent  1077314f416653b28e199c382667a1f11e444bdd
    TRAC #14706: Routine upgrade to a new upstream R version.
    
    diff --git a/sage/interfaces/r.py b/sage/interfaces/r.py
    a b  
    519519        EXAMPLES::
    520520
    521521            sage: print r._source("print.anova")
    522             function (x, digits = max(getOption("digits") - 2, 3), signif.stars = getOption("show.signif.stars"),
     522            function (x, digits = max(getOption("digits") - 2L, 3L), signif.stars = getOption("show.signif.stars"),
    523523            ...
    524524        """
    525525        if s[-2:] == "()":
     
    539539        EXAMPLES::
    540540
    541541            sage: print r.source("print.anova")
    542             function (x, digits = max(getOption("digits") - 2, 3), signif.stars = getOption("show.signif.stars"),
     542            function (x, digits = max(getOption("digits") - 2L, 3L), signif.stars = getOption("show.signif.stars"),
    543543            ...
    544544        """
    545545        return self._source(s)
     
    553553        EXAMPLES::
    554554
    555555            sage: r.version()
    556             ((2, 15, 2), 'R version 2.15.2 (2012-10-26)')
     556            ((3, 0, 1), 'R version 3.0.1 (2013-05-16)')
    557557        """
    558558        major_re = re.compile('^major\s*(\d.*?)$', re.M)
    559559        minor_re = re.compile('^minor\s*(\d.*?)$', re.M)
     
    20472047    EXAMPLES::
    20482048
    20492049        sage: r.version()
    2050         ((2, 15, 2), 'R version 2.15.2 (2012-10-26)')
     2050        ((3, 0, 1), 'R version 3.0.1 (2013-05-16)')
    20512051    """
    20522052    return r.version()
    20532053