[Python-modules-commits] r21736 - in packages/ipython/trunk/debian (2 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Sunday, May 13, 2012 @ 22:46:25
  Author: jtaylor-guest
Revision: 21736

prefer local mathjax installation over the system one

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2012-05-13 19:24:44 UTC (rev 21735)
+++ packages/ipython/trunk/debian/changelog	2012-05-13 22:46:25 UTC (rev 21736)
@@ -1,8 +1,10 @@
 ipython (0.12.1+dfsg-2) UNRELEASED; urgency=low
 
   * add ipython3 depend on python3-simplegeneric and remove the embedded copy
+  * update use-system-mathjax-if-available.patch:
+    prefer local mathjax installation over the system one
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Fri, 11 May 2012 00:27:28 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Mon, 14 May 2012 00:44:40 +0200
 
 ipython (0.12.1+dfsg-1) unstable; urgency=low
 

Modified: packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch	2012-05-13 19:24:44 UTC (rev 21735)
+++ packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch	2012-05-13 22:46:25 UTC (rev 21736)
@@ -6,11 +6,9 @@
  IPython/frontend/html/notebook/notebookapp.py |   10 +++++++++-
  1 files changed, 9 insertions(+), 1 deletions(-)
 
-diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py
-index 49132ec..287d06d 100644
 --- a/IPython/frontend/html/notebook/notebookapp.py
 +++ b/IPython/frontend/html/notebook/notebookapp.py
-@@ -105,6 +105,11 @@ class NotebookWebApplication(web.Application):
+@@ -105,6 +105,11 @@
              (r"/notebooks/%s" % _notebook_id_regex, NotebookHandler),
              (r"/rstservice/render", RSTHandler)
          ]
@@ -22,16 +20,13 @@
          settings = dict(
              template_path=os.path.join(os.path.dirname(__file__), "templates"),
              static_path=os.path.join(os.path.dirname(__file__), "static"),
-@@ -278,7 +283,10 @@ class NotebookApp(BaseIPythonApplication):
-         if not self.enable_mathjax:
-             return u''
-         static_path = self.webapp_settings.get("static_path", os.path.join(os.path.dirname(__file__), "static"))
--        if os.path.exists(os.path.join(static_path, 'mathjax', "MathJax.js")):
-+        if os.path.exists("/usr/share/javascript/mathjax/MathJax.js"):
-+            self.log.info("Using system MathJax")
-+            return u"mathjax/MathJax.js"
-+        elif os.path.exists(os.path.join(static_path, 'mathjax', "MathJax.js")):
+@@ -284,6 +289,9 @@
+         if os.path.exists(os.path.join(static_path, 'mathjax', "MathJax.js")):
              self.log.info("Using local MathJax")
              return u"static/mathjax/MathJax.js"
++        elif os.path.exists("/usr/share/javascript/mathjax/MathJax.js"):
++            self.log.info("Using system MathJax")
++            return u"mathjax/MathJax.js"
          else:
--- 
+             self.log.info("Using MathJax from CDN")
+             return u"http://cdn.mathjax.org/mathjax/latest/MathJax.js"