[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[cjerdonek at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c65ec27d3047832d990cf87d73c2da096e186acc
Author: cjerdonek at webkit.org <cjerdonek at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 20 19:36:04 2010 +0000

    2010-02-20  Chris Jerdonek  <cjerdonek at webkit.org>
    
            Reviewed by Adam Barth.
    
            Moved BeautifulSoup to webkitpy/thirdparty directory.
    
            https://bugs.webkit.org/show_bug.cgi?id=35195
    
            * Scripts/webkitpy/BeautifulSoup.py: Removed.
              - Moved to webkitpy/thirdparty.
    
            * Scripts/webkitpy/bugzilla.py:
              - Updated import statement.
    
            * Scripts/webkitpy/bugzilla_unittest.py:
              - Updated import statement.
    
            * Scripts/webkitpy/buildbot.py:
              - Updated import statement.
    
            * Scripts/webkitpy/buildbot_unittest.py:
              - Updated import statement.
    
            * Scripts/webkitpy/statusserver.py:
              - Updated import statement.
    
            * Scripts/webkitpy/thirdparty/BeautifulSoup.py: Copied from WebKitTools/Scripts/webkitpy/BeautifulSoup.py.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55055 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3cd1331..c433059 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,34 @@
 
         Reviewed by Adam Barth.
 
+        Moved BeautifulSoup to webkitpy/thirdparty directory.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35195
+
+        * Scripts/webkitpy/BeautifulSoup.py: Removed.
+          - Moved to webkitpy/thirdparty.
+
+        * Scripts/webkitpy/bugzilla.py:
+          - Updated import statement.
+
+        * Scripts/webkitpy/bugzilla_unittest.py:
+          - Updated import statement.
+
+        * Scripts/webkitpy/buildbot.py:
+          - Updated import statement.
+
+        * Scripts/webkitpy/buildbot_unittest.py:
+          - Updated import statement.
+
+        * Scripts/webkitpy/statusserver.py:
+          - Updated import statement.
+
+        * Scripts/webkitpy/thirdparty/BeautifulSoup.py: Copied from WebKitTools/Scripts/webkitpy/BeautifulSoup.py.
+
+2010-02-20  Chris Jerdonek  <cjerdonek at webkit.org>
+
+        Reviewed by Adam Barth.
+
         Created a directory for third-party Python code, and moved
         autoinstall.py into it.
 
diff --git a/WebKitTools/Scripts/webkitpy/bugzilla.py b/WebKitTools/Scripts/webkitpy/bugzilla.py
index 4506af2..00e6940 100644
--- a/WebKitTools/Scripts/webkitpy/bugzilla.py
+++ b/WebKitTools/Scripts/webkitpy/bugzilla.py
@@ -41,9 +41,9 @@ from webkitpy.committers import CommitterList
 from webkitpy.credentials import Credentials
 from webkitpy.user import User
 
-# WebKit includes a built copy of BeautifulSoup in Scripts/webkitpy
+# WebKit includes a built copy of BeautifulSoup in Scripts/webkitpy/thirdparty
 # so this import should always succeed.
-from .BeautifulSoup import BeautifulSoup, SoupStrainer
+from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup, SoupStrainer
 
 from mechanize import Browser
 
diff --git a/WebKitTools/Scripts/webkitpy/bugzilla_unittest.py b/WebKitTools/Scripts/webkitpy/bugzilla_unittest.py
index d555f78..0f3bf89 100644
--- a/WebKitTools/Scripts/webkitpy/bugzilla_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/bugzilla_unittest.py
@@ -33,7 +33,7 @@ from webkitpy.bugzilla import Bugzilla, BugzillaQueries, parse_bug_id, Committer
 from webkitpy.outputcapture import OutputCapture
 from webkitpy.mock import Mock
 
-from webkitpy.BeautifulSoup import BeautifulSoup
+from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup
 
 
 class MockBrowser(object):
diff --git a/WebKitTools/Scripts/webkitpy/buildbot.py b/WebKitTools/Scripts/webkitpy/buildbot.py
index 38828fd..38d103a 100644
--- a/WebKitTools/Scripts/webkitpy/buildbot.py
+++ b/WebKitTools/Scripts/webkitpy/buildbot.py
@@ -34,9 +34,9 @@ import urllib2
 # Import WebKit-specific modules.
 from webkitpy.webkit_logging import log
 
-# WebKit includes a built copy of BeautifulSoup in Scripts/webkitpy
+# WebKit includes a built copy of BeautifulSoup in Scripts/webkitpy/thirdparty
 # so this import should always succeed.
-from .BeautifulSoup import BeautifulSoup
+from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup
 
 
 class BuildBot:
diff --git a/WebKitTools/Scripts/webkitpy/buildbot_unittest.py b/WebKitTools/Scripts/webkitpy/buildbot_unittest.py
index bde3e04..21dfd11 100644
--- a/WebKitTools/Scripts/webkitpy/buildbot_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/buildbot_unittest.py
@@ -30,7 +30,7 @@ import unittest
 
 from webkitpy.buildbot import BuildBot
 
-from webkitpy.BeautifulSoup import BeautifulSoup
+from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup
 
 class BuildBotTest(unittest.TestCase):
 
diff --git a/WebKitTools/Scripts/webkitpy/statusserver.py b/WebKitTools/Scripts/webkitpy/statusserver.py
index ff0ddfa..9a56702 100644
--- a/WebKitTools/Scripts/webkitpy/statusserver.py
+++ b/WebKitTools/Scripts/webkitpy/statusserver.py
@@ -30,9 +30,9 @@ from webkitpy.networktransaction import NetworkTransaction
 from webkitpy.webkit_logging import log
 from mechanize import Browser
 
-# WebKit includes a built copy of BeautifulSoup in Scripts/webkitpy
+# WebKit includes a built copy of BeautifulSoup in Scripts/webkitpy/thirdparty
 # so this import should always succeed.
-from .BeautifulSoup import BeautifulSoup
+from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup
 
 import urllib2
 
diff --git a/WebKitTools/Scripts/webkitpy/BeautifulSoup.py b/WebKitTools/Scripts/webkitpy/thirdparty/BeautifulSoup.py
similarity index 100%
rename from WebKitTools/Scripts/webkitpy/BeautifulSoup.py
rename to WebKitTools/Scripts/webkitpy/thirdparty/BeautifulSoup.py

-- 
WebKit Debian packaging