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

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 12ddaecca1a400a98b29f3ec9a1ac34e9c237335
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 02:56:45 2010 +0000

    2010-09-07  Kent Tamura  <tkent at chromium.org>
    
            Reviewed by Tony Chang.
    
            test-webkitpy: Fix load error of
            webkitpy/layout_tests/port/factory_unittest.py on Win32 Python
            https://bugs.webkit.org/show_bug.cgi?id=45356 Need a short
    
            * Scripts/webkitpy/layout_tests/port/server_process.py:
              Avoid to import fcntl on win32. Win32 Python doesn't have fcntl
              and we don't use server_process.py on Win32 Python. However
              unittest.py tries to load everything in a module.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66946 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d709fd1..74dca62 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-07  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        test-webkitpy: Fix load error of
+        webkitpy/layout_tests/port/factory_unittest.py on Win32 Python
+        https://bugs.webkit.org/show_bug.cgi?id=45356 Need a short
+
+        * Scripts/webkitpy/layout_tests/port/server_process.py:
+          Avoid to import fcntl on win32. Win32 Python doesn't have fcntl
+          and we don't use server_process.py on Win32 Python. However
+          unittest.py tries to load everything in a module.
+
 2010-09-07  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/server_process.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/server_process.py
index bccdf18..8e0bc11 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/server_process.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/server_process.py
@@ -29,7 +29,6 @@
 
 """Package that implements the ServerProcess wrapper class"""
 
-import fcntl
 import logging
 import os
 import select
@@ -37,6 +36,8 @@ import signal
 import subprocess
 import sys
 import time
+if sys.platform != 'win32':
+    import fcntl
 
 from webkitpy.common.system.executive import Executive
 

-- 
WebKit Debian packaging