[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e8a1b38852732293780df8b1058609b976084e3d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 14 07:17:47 2010 +0000

    2010-08-14  Eric Seidel  <eric at webkit.org>
    
            Unreviewed.  Another fix to support python 2.3.
    
            Add support for MathML entities
            https://bugs.webkit.org/show_bug.cgi?id=43949
    
            * Scripts/webkitpy/thirdparty/simplejson/decoder.py:
             - It looks like our simplejson is version 1.7.3 which
               should be python 2.3 compatible.  But someone modified
               our copy slightly from the original source.
               I've removed the relative import in hopes this fixes
               the problem.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65360 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a4d26a5..a67f2a6 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-14  Eric Seidel  <eric at webkit.org>
+
+        Unreviewed.  Another fix to support python 2.3.
+
+        Add support for MathML entities
+        https://bugs.webkit.org/show_bug.cgi?id=43949
+
+        * Scripts/webkitpy/thirdparty/simplejson/decoder.py:
+         - It looks like our simplejson is version 1.7.3 which
+           should be python 2.3 compatible.  But someone modified
+           our copy slightly from the original source.
+           I've removed the relative import in hopes this fixes
+           the problem.
+
 2010-08-13  Eric Seidel  <eric at webkit.org>
 
         Unreviewed.  Build fix only.
diff --git a/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/decoder.py b/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/decoder.py
index b887b58..63f70cb 100644
--- a/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/decoder.py
+++ b/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/decoder.py
@@ -3,7 +3,7 @@ Implementation of JSONDecoder
 """
 import re
 
-from .scanner import Scanner, pattern
+from scanner import Scanner, pattern
 
 FLAGS = re.VERBOSE | re.MULTILINE | re.DOTALL
 

-- 
WebKit Debian packaging