[Python-modules-commits] r18039 - in packages/sphinx/trunk/debian (changelog jstest/jstest.py)

[jwilk at users.alioth.debian.org]

    Date: Saturday, August 6, 2011 @ 10:45:03
  Author: jwilk
Revision: 18039

JavaScript test suite: don't hang if get_title() returns None.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/jstest/jstest.py

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2011-08-06 01:10:03 UTC (rev 18038)
+++ packages/sphinx/trunk/debian/changelog	2011-08-06 10:45:03 UTC (rev 18039)
@@ -1,3 +1,10 @@
+sphinx (1.0.7+dfsg-2) UNRELEASED; urgency=low
+
+  * JavaScript test suite: don't hang if get_title() returns None. Thanks to
+    Ansgar Burchardt for the bug report.
+
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 06 Aug 2011 12:44:13 +0200
+
 sphinx (1.0.7+dfsg-1) unstable; urgency=medium
 
   * Strip jQuery and Underscore.js from the upstream tarball (closes:

Modified: packages/sphinx/trunk/debian/jstest/jstest.py
===================================================================
--- packages/sphinx/trunk/debian/jstest/jstest.py	2011-08-06 01:10:03 UTC (rev 18038)
+++ packages/sphinx/trunk/debian/jstest/jstest.py	2011-08-06 10:45:03 UTC (rev 18039)
@@ -70,7 +70,7 @@
         # We use a trick from <http://code.google.com/p/pywebkitgtk/wiki/HowDoI> instead.
         self._view.execute_script('document.title = document.documentElement.innerHTML')
         try:
-            return self._view.get_main_frame().get_title()
+            return self._view.get_main_frame().get_title() or ''
         finally:
             self._view.execute_script('document.title = ""')