[Python-modules-commits] r22761 - in packages/ipython/trunk/debian (6 files)

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

    Date: Monday, October 15, 2012 @ 23:02:25
  Author: jtaylor-guest
Revision: 22761

refresh patches, drop applied except-shadows-builtin-fix.patch

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/parallel-2to3.patch
  packages/ipython/trunk/debian/patches/series
  packages/ipython/trunk/debian/patches/shared-static-path.patch
  packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
  packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2012-10-15 23:02:15 UTC (rev 22760)
+++ packages/ipython/trunk/debian/changelog	2012-10-15 23:02:25 UTC (rev 22761)
@@ -1,6 +1,7 @@
 ipython (0.13.1~20120901-1) UNRELEASED; urgency=low
 
   * snapshot of 0.13.1 branch
+  * refresh patches, drop applied except-shadows-builtin-fix.patch
 
  -- Julian Taylor <jtaylor at ubuntu.com>  Sat, 01 Sep 2012 13:39:25 +0200
 

Modified: packages/ipython/trunk/debian/patches/parallel-2to3.patch
===================================================================
--- packages/ipython/trunk/debian/patches/parallel-2to3.patch	2012-10-15 23:02:15 UTC (rev 22760)
+++ packages/ipython/trunk/debian/patches/parallel-2to3.patch	2012-10-15 23:02:25 UTC (rev 22761)
@@ -4,7 +4,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -233,6 +233,17 @@
+@@ -264,6 +264,17 @@
                                    "ipython_win_post_install.py"}}
      
      if PY3:

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2012-10-15 23:02:15 UTC (rev 22760)
+++ packages/ipython/trunk/debian/patches/series	2012-10-15 23:02:25 UTC (rev 22761)
@@ -5,4 +5,3 @@
 use-system-mathjax-if-available.patch
 parallel-2to3.patch
 shared-static-path.patch
-except-shadows-builtin-fix.patch

Modified: packages/ipython/trunk/debian/patches/shared-static-path.patch
===================================================================
--- packages/ipython/trunk/debian/patches/shared-static-path.patch	2012-10-15 23:02:15 UTC (rev 22760)
+++ packages/ipython/trunk/debian/patches/shared-static-path.patch	2012-10-15 23:02:25 UTC (rev 22761)
@@ -5,14 +5,14 @@
 
 --- a/IPython/frontend/html/notebook/notebookapp.py
 +++ b/IPython/frontend/html/notebook/notebookapp.py
-@@ -147,7 +147,7 @@
- 
+@@ -157,7 +157,7 @@
+         
          settings = dict(
              template_path=os.path.join(os.path.dirname(__file__), "templates"),
 -            static_path=os.path.join(os.path.dirname(__file__), "static"),
 +            static_path=os.path.join("/usr/share/ipython/notebook/static"),
              cookie_secret=os.urandom(1024),
-             login_url="/login",
+             login_url="%s/login"%(base_project_url.rstrip('/')),
          )
 @@ -366,7 +366,7 @@
      def _mathjax_url_default(self):

Modified: packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch	2012-10-15 23:02:15 UTC (rev 22760)
+++ packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch	2012-10-15 23:02:25 UTC (rev 22761)
@@ -13,7 +13,7 @@
 
 --- a/IPython/core/interactiveshell.py
 +++ b/IPython/core/interactiveshell.py
-@@ -145,7 +145,7 @@
+@@ -129,7 +129,7 @@
      elif os.name=='nt':
          return 'Linux'
      else:

Modified: packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch	2012-10-15 23:02:15 UTC (rev 22760)
+++ packages/ipython/trunk/debian/patches/use-system-mathjax-if-available.patch	2012-10-15 23:02:25 UTC (rev 22761)
@@ -8,19 +8,18 @@
 
 --- a/IPython/frontend/html/notebook/notebookapp.py
 +++ b/IPython/frontend/html/notebook/notebookapp.py
-@@ -140,6 +140,11 @@
-             (r"/clusters/%s/%s" % (_profile_regex, _cluster_action_regex), ClusterActionHandler),
-             (r"/clusters/%s" % _profile_regex, ClusterProfileHandler),
-         ]
+@@ -150,6 +150,10 @@
+         # Note that the URLs these patterns check against are escaped,
+         # and thus guaranteed to be ASCII: 'héllo' is really 'h%C3%A9llo'.
+         base_project_url = py3compat.unicode_to_str(base_project_url, 'ascii')
 +
 +        if os.path.exists("/usr/share/javascript/mathjax/MathJax.js"):
 +          handlers.append((r"/mathjax/(.*)", web.StaticFileHandler,
 +                           {"path": "/usr/share/javascript/mathjax"}))
-+
+         
          settings = dict(
              template_path=os.path.join(os.path.dirname(__file__), "templates"),
-             static_path=os.path.join(os.path.dirname(__file__), "static"),
-@@ -367,6 +372,9 @@
+@@ -368,6 +372,9 @@
          if os.path.exists(os.path.join(static_path, 'mathjax', "MathJax.js")):
              self.log.info("Using local MathJax")
              return static_url_prefix+u"mathjax/MathJax.js"