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

eric at webkit.org eric at webkit.org
Wed Dec 22 14:59:12 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit eb3436c242c7ed954384d1dbc7db0f5f7786d72e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 26 23:15:25 2010 +0000

    2010-10-26  Eric Seidel  <eric at webkit.org>
    
            Unreviewed.  Adding import with_statement to fix python 2.5.
    
            Teach webkit-patch how to read credentials from the environment
            https://bugs.webkit.org/show_bug.cgi?id=48275
    
            * Scripts/webkitpy/common/net/credentials_unittest.py:
             - import with_statement to fix python 2.5.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70586 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index faae999..a9a57b3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-26  Eric Seidel  <eric at webkit.org>
+
+        Unreviewed.  Adding import with_statement to fix python 2.5.
+
+        Teach webkit-patch how to read credentials from the environment
+        https://bugs.webkit.org/show_bug.cgi?id=48275
+
+        * Scripts/webkitpy/common/net/credentials_unittest.py:
+         - import with_statement to fix python 2.5.
+
 2010-10-26  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKitTools/Scripts/webkitpy/common/net/credentials_unittest.py b/WebKitTools/Scripts/webkitpy/common/net/credentials_unittest.py
index 3e04223..6f2d909 100644
--- a/WebKitTools/Scripts/webkitpy/common/net/credentials_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/common/net/credentials_unittest.py
@@ -26,6 +26,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+from __future__ import with_statement
+
 import os
 import tempfile
 import unittest

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list