Merge branch 't/18110/improve__unable_to_convert_string__error_message' into t/18084/fix_bad_library_uses_if_var__

jdemeyer · jdemeyer · commit 52c15f5b7606 · 2015-04-02T17:39:50.000+02:00
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-Sage version 6.6.rc1, released 2015-03-27
+Sage version 6.6.rc2, released 2015-04-02
diff --git a/build/deps b/build/deps
@@ -460,7 +460,7 @@ $(INST)/$(M4RIE): $(INST)/$(M4RI) $(INST)/$(GIVARO) $(INST)/$(NTL)
 $(INST)/$(ZNPOLY): $(INST)/$(SAGE_MP_LIBRARY) | $(INST)/$(PYTHON)
 	+$(PIPE) "$(SAGE_SPKG) $(ZNPOLY) 2>&1" "tee -a $(SAGE_LOGS)/$(ZNPOLY).log"
 
-$(INST)/$(SAGENB): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS) $(INST)/$(PEXPECT) \
+$(INST)/$(SAGENB): $(INST)/$(PIP) $(INST)/$(PEXPECT) \
                    $(INST)/$(JINJA2) $(INST)/$(SPHINX) $(INST)/$(DOCUTILS)
 	+$(PIPE) "$(SAGE_SPKG) $(SAGENB) 2>&1" "tee -a $(SAGE_LOGS)/$(SAGENB).log"
 
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=73f6e52f728f2586564746c77e94224a71b64b9a
-md5=bf32b13ff7c9aa6d72584397f4596b3a
-cksum=2050435266
+sha1=6b6e8457815b8e910102b18d107563f2c38a6156
+md5=f430b72dfc9ee0bfeb75f16dbf5dfda7
+cksum=2088594908
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-78
+79
diff --git a/build/pkgs/ipython/package-version.txt b/build/pkgs/ipython/package-version.txt
@@ -1 +1 @@
-3.0.0
+3.0.0.p1
diff --git a/build/pkgs/ipython/patches/catch_termios_error.patch b/build/pkgs/ipython/patches/catch_termios_error.patch
@@ -0,0 +1,23 @@
+See https://github.com/ipython/ipython/pull/8208
+
+    Catch termios.error in pager
+    
+    This error is raised by termios.tcgetattr on really old Linux versions
+    (here: Ubuntu 8.04.4) in doctests, that is, without a real stdout.
+
+diff --git a/IPython/core/page.py b/IPython/core/page.py
+index 2a0305e..067b540 100644
+--- a/IPython/core/page.py
++++ b/IPython/core/page.py
+@@ -100,7 +100,10 @@ def _detect_screen_size(screen_lines_def):
+     # flags each time), we just save the initial terminal state and
+     # unconditionally reset it every time.  It's cheaper than making
+     # the checks.
+-    term_flags = termios.tcgetattr(sys.stdout)
++    try:
++        term_flags = termios.tcgetattr(sys.stdout)
++    except termios.error as err:
++        raise TypeError
+ 
+     # Curses modifies the stdout buffer size by default, which messes
+     # up Python's normal stdout buffering.  This would manifest itself
diff --git a/build/pkgs/sagenb/spkg-install b/build/pkgs/sagenb/spkg-install
@@ -33,25 +33,21 @@ if [ $SAGE64 = "yes" ]; then
     export CXXFLAGS="$CXXFLAGS $CFLAG64"
     export LDFLAGS="$LDFLAGS $CFLAG64"
 fi
-
 # End boilerplate
 
+# delete old sagenb install, if any
+rm -rf "${SAGE_LOCAL}/lib/python/site-packages"/sagenb*
 
-
-# Install dependencies
-for PKG in $(cat src/install_order); do
-    easy_install -H None "src/$PKG" || die "Error installing $PKG !"
-done
-PKG=$(ls -1 src | GREP_OPTIONS= grep sagenb-)
-
-# Install sagenb into site-packages
-easy_install -H None "src/$PKG" || die "Error installing sagenb !"
+# install new sagenb
+pip install --no-index \
+    --find-links="file://$(pwd)/src/" sagenb
+if [ $? -ne 0 ]; then
+    echo >&2 "Error: Installing SageNB failed."
+    exit 1
+fi
 
 # let sagenb use mathjax spkg
-SAGENB_VERSION=$(cat ${SAGE_ROOT}/build/pkgs/sagenb/package-version.txt)
-PYTHON_MAJOR_VERSION=$(cat ${SAGE_ROOT}/build/pkgs/python/package-version.txt | sed 's/\.[^.]*$//g')
-cd ${SAGE_LOCAL}/lib/python/site-packages/sagenb-${SAGENB_VERSION}-py${PYTHON_MAJOR_VERSION}.egg/sagenb/data
+cd "${SAGE_LOCAL}/lib/python/site-packages/sagenb/data"
 # the following line can be removed once sagenb does not ship mathjax anymore.
 rm -rf mathjax
-ln -s ../../../../../../share/mathjax/ mathjax
-
+ln -s ../../../../../share/mathjax/ mathjax
diff --git a/src/bin/sage b/src/bin/sage
@@ -365,7 +365,7 @@ fi
 
 if [ "$1" = '-v' -o "$1" = '-version' -o "$1" = '--version' ]; then
 	. "$SAGE_LOCAL"/bin/sage-version.sh
-	echo "Sage Version ${SAGE_VERSION}, Release Date: ${SAGE_RELEASE_DATE}"
+	echo "SageMath Version ${SAGE_VERSION}, Release Date: ${SAGE_RELEASE_DATE}"
 	exit 0
 fi
 
diff --git a/src/bin/sage-banner b/src/bin/sage-banner
@@ -1,5 +1,5 @@
 ┌────────────────────────────────────────────────────────────────────┐
-│ Sage Version 6.6.rc1, Release Date: 2015-03-27                     │
+│ SageMath Version 6.6.rc2, Release Date: 2015-04-02                 │
 │ Type "notebook()" for the browser-based notebook interface.        │
 │ Type "help()" for help.                                            │
 └────────────────────────────────────────────────────────────────────┘
diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh
@@ -1,4 +1,4 @@
 # Sage version information for shell scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='6.6.rc1'
-SAGE_RELEASE_DATE='2015-03-27'
+SAGE_VERSION='6.6.rc2'
+SAGE_RELEASE_DATE='2015-04-02'
diff --git a/src/doc/de/tutorial/interactive_shell.rst b/src/doc/de/tutorial/interactive_shell.rst
@@ -250,7 +250,7 @@ Zeit, die der Aufruf benötigt, ausgegeben nachdem er gelaufen ist.
 Zum Beispiel können wir die Laufzeit einer bestimmten Potenzierung auf
 verschiedene Arten vergleichen. Die unten genannte Laufzeit wird unter
 Umständen weit von der Laufzeit auf Ihrem Computer oder sogar zwischen
-verschiedenen Sage Versionen abweichen. Zuerst natives Python:
+verschiedenen SageMath Versionen abweichen. Zuerst natives Python:
 
 .. skip
 
@@ -758,13 +758,13 @@ oder Betriebssystemen wieder geladen werden. Zum Beispiel können Sie
 eine riesige Matrix auf einem 32 Bit Mac OS X speichern und später auf
 einem 64 Bit Linux System laden, dort die Stufenform herstellen und dann
 wieder zurückladen. Außerdem können Sie in den meisten Fällen auch Objekte
-laden, die mit anderen Sage Versionen gespeichert wurden, solange der Quelltext
+laden, die mit anderen SageMath Versionen gespeichert wurden, solange der Quelltext
 des Objekts nicht zu verschieden ist. Alle Attribute eines Objekts werden zusammen
 mit seiner Klasse (aber nicht dem Quellcode) gespeichert. Sollte diese Klasse
-in einer neueren Sage Version nicht mehr existieren, kann das Objekt in dieser
-neueren Sage Version nicht mehr geladen werden. Aber Sie könnten es in der alten
-Sage Version laden, die Objekt Dictionaries mit ``x.__dict__`` laden und das Objekt
-zusammen mit diesem in der neuen Sage Version laden.
+in einer neueren SageMath Version nicht mehr existieren, kann das Objekt in dieser
+neueren SageMath Version nicht mehr geladen werden. Aber Sie könnten es in der alten
+SageMath Version laden, die Objekt Dictionaries mit ``x.__dict__`` laden und das Objekt
+zusammen mit diesem in der neuen SageMath Version laden.
 
 Als Text speichern
 ------------------
diff --git a/src/doc/de/tutorial/introduction.rst b/src/doc/de/tutorial/introduction.rst
@@ -147,7 +147,7 @@ Langfristige Ziele von Sage
    Quellcode lesen. Falls Sie Sage verwenden, um Berechnungen für ein
    Paper durchzuführen, welches Sie veröffentlichen, können Sie
    sicher sein, dass Ihre Leser immer freien Zugang zu Sage und
-   seinem Quellcode haben und Sie dürfen sogar Ihre Sage Version
+   seinem Quellcode haben und Sie dürfen sogar Ihre SageMath Version
    archivieren und weiterverteilen.
 
 -  **einfach zu kompilieren:** Sage sollte für GNU/Linux, Mac OS X und
diff --git a/src/sage/combinat/sf/macdonald.py b/src/sage/combinat/sf/macdonald.py
@@ -115,7 +115,7 @@ def __init__(self, Sym, q='q', t='t'):
             sage: Sym = SymmetricFunctions(FractionField(QQ['t'])).macdonald()
             Traceback (most recent call last):
             ...
-            TypeError: unable to convert string
+            TypeError: unable to evaluate 'q' in Fraction Field of Univariate Polynomial Ring in t over Rational Field
         """
         self._sym = Sym
         self._s = Sym.s()
diff --git a/src/sage/functions/other.py b/src/sage/functions/other.py
@@ -464,6 +464,16 @@ def _eval_(self, x):
                 return Integer(int(math.ceil(x)))
         return None
 
+    def _evalf_(self, x, **kwds):
+        """
+        TESTS::
+
+            sage: h(x) = ceil(x)
+            sage: h(pi)._numerical_approx()
+            4
+        """
+        return self._eval_(x)
+
 ceil = Function_ceil()
 
 
@@ -626,6 +636,16 @@ def _eval_(self, x):
                 return Integer(int(math.floor(x)))
         return None
 
+    def _evalf_(self, x, **kwds):
+        """
+        TESTS::
+
+            sage: h(x) = floor(x)
+            sage: h(pi)._numerical_approx()
+            3
+        """
+        return self._eval_(x)
+
 floor = Function_floor()
 
 class Function_gamma(GinacFunction):
@@ -1391,6 +1411,16 @@ def _eval_(self, x):
 
         return None
 
+    def _evalf_(self, x, **kwds):
+        """
+        TESTS::
+
+            sage: h(x) = factorial(x)
+            sage: h(5)._numerical_approx()
+            120.000000000000
+        """
+        return self._eval_(x)
+
 factorial = Function_factorial()
 
 class Function_binomial(GinacFunction):
diff --git a/src/sage/groups/abelian_gps/abelian_group.py b/src/sage/groups/abelian_gps/abelian_group.py
@@ -1305,8 +1305,16 @@ def subgroups(self, check=False):
 
             sage: AbelianGroup([]).subgroups()
             [Trivial Abelian group]
+
+        Check that :trac:`14196` is fixed::
+
+            sage: B = AbelianGroup([1,2])
+            sage: B.subgroups()
+            [Multiplicative Abelian subgroup isomorphic to C2 generated by {f1},
+             Trivial Abelian subgroup]
         """
-        if not self.is_finite(): raise ValueError("Group must be finite")
+        if not self.is_finite():
+            raise ValueError("Group must be finite")
         from sage.misc.misc import verbose
 
         if self.is_trivial():
@@ -1323,16 +1331,19 @@ def subgroups(self, check=False):
 
         subgps = []
         for G in Wsubs:
+            ngens = len(G.gens())
             verbose("G = subgp generated by %s" % list(G.gens()))
-            verbose("invariants are:", [t.order() for t in G.gens()])
+            verbose("invariants are: %s" % [t.order() for t in G.gens()])
             for H in divisors(x):
                 # H = the subgroup of *index* H.
-                its = [xrange(0, H, H/gcd(H, G.gen(i).order())) for i in xrange(len(G.gens()))]
+                its = [xrange(0, H, H/gcd(H, G.gen(i).order())) for i in xrange(ngens)]
                 for f in cartesian_product_iterator(its):
                     verbose("using hom from G to C_%s sending gens to %s" % (H,f))
                     new_sub = []
-                    for a in xrange(len(G.gens())):
-                        new_sub.append(G.gen(a).list() + [f[a]])
+                    for a in xrange(ngens):
+                        val = G.gen(a).list() + [f[a]]
+                        if any(l != 0 for l in val):
+                            new_sub.append(val)
                     if H != x:
                         new_sub.append([0]*A.ngens() + [H])
                     subgps.append(self.subgroup_reduced(new_sub))
diff --git a/src/sage/interfaces/sage0.py b/src/sage/interfaces/sage0.py
@@ -385,7 +385,7 @@ def console(self):
 
             sage: sage0.console() #not tested
             ----------------------------------------------------------------------
-            | Sage Version ..., Release Date: ...                                |
+            | SageMath Version ..., Release Date: ...                            |
             | Type notebook() for the GUI, and license() for information.        |
             ----------------------------------------------------------------------
             ...
@@ -397,7 +397,7 @@ def version(self):
         EXAMPLES::
 
             sage: sage0.version()
-            'Sage Version ..., Release Date: ...'
+            'SageMath Version ..., Release Date: ...'
             sage: sage0.version() == version()
             True
         """
@@ -549,7 +549,7 @@ def sage0_console():
 
         sage: sage0_console() #not tested
         ----------------------------------------------------------------------
-        | Sage Version ..., Release Date: ...                                |
+        | SageMath Version ..., Release Date: ...                            |
         | Type notebook() for the GUI, and license() for information.        |
         ----------------------------------------------------------------------
         ...
diff --git a/src/sage/misc/banner.py b/src/sage/misc/banner.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 r"""
-Sage version and banner info
+SageMath version and banner info
 """
 
 #*****************************************************************************
@@ -25,14 +25,14 @@ def version(clone = False):
 
     EXAMPLES:
        sage: version()
-       'Sage Version ..., Release Date: ...'
+       'SageMath Version ..., Release Date: ...'
        sage: version(clone=True)
-       ('Sage Version ..., Release Date: ...',
+       ('SageMath Version ..., Release Date: ...',
         'Mercurial clone branch: ...')
     """
     import os
     branch = os.popen("ls -l "+SAGE_SRC).read().split()[-1][5:]
-    v = 'Sage Version %s, Release Date: %s'%(SAGE_VERSION, SAGE_DATE)
+    v = 'SageMath Version %s, Release Date: %s'%(SAGE_VERSION, SAGE_DATE)
     if clone:
         return v,"Mercurial clone branch: %s"%branch
     return v
@@ -54,7 +54,7 @@ def banner_text():
 
         sage: print sage.misc.banner.banner_text()
         ┌────────────────────────────────────────────────────────────────────┐
-        │ Sage Version ...
+        │ SageMath Version ...
     """
     bars = u"─"*68
     s = u'┌' + bars + u'┐'
@@ -91,7 +91,7 @@ def banner():
 
         sage: banner()
         ┌────────────────────────────────────────────────────────────────────┐
-        │ Sage Version ..., Release Date: ...
+        │ SageMath Version ..., Release Date: ...
         │ Type "notebook()" for the browser-based notebook interface.        │
         │ Type "help()" for help.                                            │
         ...
@@ -132,8 +132,8 @@ def version_dict():
 
     EXAMPLES:
         sage: from sage.misc.banner import version_dict
-        sage: print "Sage major version is %s" % version_dict()['major']
-        Sage major version is ...
+        sage: print "SageMath major version is %s" % version_dict()['major']
+        SageMath major version is ...
         sage: version_dict()['major'] == int(sage.version.version.split('.')[0])
         True
     """
@@ -191,7 +191,7 @@ def require_version(major, minor=0, tiny=0, prerelease=False,
         sage: require_version(821, 4)
         False
         sage: require_version(821, 4, print_message=True)
-        This code requires at least version 821.4 of Sage to run correctly.
+        This code requires at least version 821.4 of SageMath to run correctly.
         You are running version ...
         False
     """
@@ -206,7 +206,7 @@ def require_version(major, minor=0, tiny=0, prerelease=False,
         return True
     else:
         if print_message:
-            print("This code requires at least version {} of Sage to run correctly.". 
+            print("This code requires at least version {} of SageMath to run correctly.". 
                    format(major + 0.1 * minor + 0.01 * tiny))
             print("You are running version {}.".format(SAGE_VERSION))
         return False
diff --git a/src/sage/misc/cachefunc.pyx b/src/sage/misc/cachefunc.pyx
@@ -790,13 +790,20 @@ cdef class CachedFunction(object):
             sage: type(I.groebner_basis)
             <type 'sage.misc.cachefunc.CachedMethodCaller'>
             sage: os.path.exists(sage_getfile(I.groebner_basis))
-            True        
+            True
+
+        Test that :trac:`18064` is fixed::
 
+            sage: @cached_function
+            ....: def f():
+            ....:     return 3
+            sage: f._sage_doc_()
+            'File: ... (starting at line 1)\n'
         """
         from sage.misc.sageinspect import _extract_embedded_position
         f = self.f
         doc = f.__doc__ or ''
-        if _extract_embedded_position(doc.splitlines()[0]) is None:
+        if not doc or _extract_embedded_position(doc.splitlines()[0]) is None:
             try:
                 sourcelines = sage_getsourcelines(f)
                 from sage.env import SAGE_SRC, SAGE_LIB
diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py
diff --git a/src/sage/misc/sageinspect.py b/src/sage/misc/sageinspect.py
diff --git a/src/sage/repl/ipython_extension.py b/src/sage/repl/ipython_extension.py
diff --git a/src/sage/repl/ipython_kernel/kernel.py b/src/sage/repl/ipython_kernel/kernel.py
diff --git a/src/sage/repl/ipython_tests.py b/src/sage/repl/ipython_tests.py
diff --git a/src/sage/rings/fraction_field.py b/src/sage/rings/fraction_field.py
diff --git a/src/sage/rings/function_field/function_field.py b/src/sage/rings/function_field/function_field.py
diff --git a/src/sage/rings/polynomial/multi_polynomial_ring.py b/src/sage/rings/polynomial/multi_polynomial_ring.py
diff --git a/src/sage/version.py b/src/sage/version.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Sage version 6.6.rc1, released 2015-03-27`
	`1`	`+Sage version 6.6.rc2, released 2015-04-02`