[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit de75223a3523d79f75f1d7fd69389c3f4fefa25c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 30 05:03:34 2009 +0000

    2009-12-29  Eric Seidel  <eric at webkit.org>
    
            Rubber-stamped by Adam Barth.
    
            Remove unused BugzillaException.
    
            * Scripts/modules/bugzilla.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52642 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 03b092e..b2a0b6f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,13 @@
 2009-12-29  Eric Seidel  <eric at webkit.org>
 
+        Rubber-stamped by Adam Barth.
+
+        Remove unused BugzillaException.
+
+        * Scripts/modules/bugzilla.py:
+
+2009-12-29  Eric Seidel  <eric at webkit.org>
+
         Reviewed by Adam Barth.
 
         Need a script to assign bugs with r+ patches to committers for landing
diff --git a/WebKitTools/Scripts/modules/bugzilla.py b/WebKitTools/Scripts/modules/bugzilla.py
index 7729813..b8fe447 100644
--- a/WebKitTools/Scripts/modules/bugzilla.py
+++ b/WebKitTools/Scripts/modules/bugzilla.py
@@ -59,10 +59,6 @@ def timestamp():
     return datetime.now().strftime("%Y%m%d%H%M%S")
 
 
-class BugzillaError(Exception):
-    pass
-
-
 # FIXME: This class is kinda a hack for now.  It exists so we have one place
 # to hold bug logic, even if much of the code deals with dictionaries still.
 class Bug(object):
@@ -322,7 +318,7 @@ class Bugzilla(object):
         # If the resulting page has a title, and it contains the word "invalid" assume it's the login failure page.
         if match and re.search("Invalid", match.group(1), re.IGNORECASE):
             # FIXME: We could add the ability to try again on failure.
-            raise BugzillaError("Bugzilla login failed: %s" % match.group(1))
+            raise Exception("Bugzilla login failed: %s" % match.group(1))
 
         self.authenticated = True
 
@@ -372,7 +368,7 @@ class Bugzilla(object):
         if match:
             text_lines = BeautifulSoup(match.group('error_message')).findAll(text=True)
             error_message = "\n" + '\n'.join(["  " + line.strip() for line in text_lines if line.strip()])
-        raise BugzillaError("Bug not created: %s" % error_message)
+        raise Exception("Bug not created: %s" % error_message)
 
     def create_bug(self, bug_title, bug_description, component=None, patch_file_object=None, patch_description=None, cc=None, mark_for_review=False, mark_for_commit_queue=False):
         self.authenticate()

-- 
WebKit Debian packaging