[Python-modules-commits] r22919 - in packages/sphinx/trunk/debian (2 files)

[jwilk at users.alioth.debian.org]

    Date: Thursday, November 8, 2012 @ 13:31:50
  Author: jwilk
Revision: 22919

dh_sphinxdoc: strip query (?...) and fragment (#...) components from JavaScript references.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2012-11-08 13:26:51 UTC (rev 22918)
+++ packages/sphinx/trunk/debian/changelog	2012-11-08 13:31:50 UTC (rev 22919)
@@ -15,6 +15,8 @@
     + Fix the --tmpdir option. Thanks to Andriy Senkovych for the bug report.
     + Ignore references to JavaScript code that start with an URI scheme.
       Thanks to Dmitry Shachnev for the bug report.
+    + Strip query (?...) and fragment (#...) components from JavaScript
+      references. Thanks to Dmitry Shachnev for the bug report.
   * Sort stopwords in searchtools.js. Thanks to Dmitry Shachnev for the bug
     report.
   * Fix compatibility with Python 3.3. Thanks to Dmitry Shachnev for the bug
@@ -24,9 +26,8 @@
   * Update Homepage field to point to http://sphinx-doc.org/.
   * Build-depend of python3-all instead of python3.
 
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 08 Nov 2012 14:30:36 +0100
 
- -- Jakub Wilk <jwilk at debian.org>  Thu, 08 Nov 2012 14:18:31 +0100
-
 sphinx (1.1.3+dfsg-4) unstable; urgency=low
 
   * Add DEP-8 tests.

Modified: packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc
===================================================================
--- packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc	2012-11-08 13:26:51 UTC (rev 22918)
+++ packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc	2012-11-08 13:31:50 UTC (rev 22919)
@@ -187,7 +187,7 @@
     close F;
     $search =~ s/<!--.*?-->//g; # strip comments
     my %js = ();
-    grep { $js{$_} = 1 unless m/^[a-z][a-z0-9.+-]*:/i or excludefile("$path/$_"); } $search =~ m{<script type="text/javascript" src="([^"]++)"></script>}g;
+    grep { s/[?#].*//; $js{$_} = 1 unless m/^[a-z][a-z0-9.+-]*:/i or excludefile("$path/$_"); } $search =~ m{<script type="text/javascript" src="([^"]++)"></script>}g;
     my $loads_searchindex = $search =~ m/\QjQuery(function() { Search.loadIndex("searchindex.js"); });\E/;
     my ($has_source) = $search =~ m{HAS_SOURCE:\s*(true|false)};
     my ($url_root) = $search =~ m{URL_ROOT:\s*'([^']*)'};