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

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ab007213ff37a1dd008b869183124eb985dcd409
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 15 06:16:25 2009 +0000

    2009-12-14  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Kill _create_step_sequence
            https://bugs.webkit.org/show_bug.cgi?id=32539
    
            It's cleaner to represent not having these sequences as an empty
            sequence instead of None.
    
            * Scripts/modules/commands/download.py:
            * Scripts/modules/stepsequence.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52136 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9883bb1..e9b2e09 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -12,6 +12,19 @@
 
 2009-12-14  Adam Barth  <abarth at webkit.org>
 
+        Reviewed by Eric Seidel.
+
+        Kill _create_step_sequence
+        https://bugs.webkit.org/show_bug.cgi?id=32539
+
+        It's cleaner to represent not having these sequences as an empty
+        sequence instead of None.
+
+        * Scripts/modules/commands/download.py:
+        * Scripts/modules/stepsequence.py:
+
+2009-12-14  Adam Barth  <abarth at webkit.org>
+
         Unreviewed.  Address reviewer comments from an earlier patch.  I didn't
         do this earlier because I was worried about conflicts in dependent
         patches.
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index 850337a..cdc81c1 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -132,28 +132,19 @@ class AbstractPatchSequencingCommand(AbstractPatchProcessingCommand):
     prepare_steps = None
     main_steps = None
 
-    @staticmethod
-    def _create_step_sequence(steps):
-        if not steps:
-            return None, []
-        step_sequence = StepSequence(steps)
-        return step_sequence, step_sequence.options()
-
     def __init__(self):
         options = []
-        self._prepare_sequence, prepare_options = self._create_step_sequence(self.prepare_steps)
-        self._main_sequence, main_options = self._create_step_sequence(self.main_steps)
-        options = sorted(set(prepare_options + main_options))
+        self._prepare_sequence = StepSequence(self.prepare_steps)
+        self._main_sequence = StepSequence(self.main_steps)
+        options = sorted(set(self._prepare_sequence.options() + self._main_sequence.options()))
         AbstractPatchProcessingCommand.__init__(self, options)
 
     def _prepare_to_process(self, options, args, tool):
-        if self._prepare_sequence:
-            self._prepare_sequence.run_and_handle_errors(tool, options)
+        self._prepare_sequence.run_and_handle_errors(tool, options)
 
     def _process_patch(self, patch, options, args, tool):
-        if self._main_sequence:
-            state = { "patch" : patch }
-            self._main_sequence.run_and_handle_errors(tool, options, state)
+        state = { "patch" : patch }
+        self._main_sequence.run_and_handle_errors(tool, options, state)
 
 
 class ProcessAttachmentsMixin(object):
diff --git a/WebKitTools/Scripts/modules/stepsequence.py b/WebKitTools/Scripts/modules/stepsequence.py
index 0e43c34..0858f91 100644
--- a/WebKitTools/Scripts/modules/stepsequence.py
+++ b/WebKitTools/Scripts/modules/stepsequence.py
@@ -41,7 +41,7 @@ class StepSequenceErrorHandler():
 
 class StepSequence(object):
     def __init__(self, steps):
-        self._steps = steps
+        self._steps = steps or []
 
     def options(self):
         collected_options = [

-- 
WebKit Debian packaging