Move yield_full_tree() in its own member function.

gclient.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Meta checkout manager supporting both Subversion and GIT.
 
 Files
   .gclient      : Current client configuration, written by 'config' command.
                   Format is a Python script defining 'solutions', a list whose
@@ skipping 257 matching lines @@
       for i in root_deps:
         if i is self.parent:
           break
         if i.name:
           self._requirements.add(i.name)
 
     if isinstance(self.url, self.FromImpl):
       self._requirements.add(self.url.module_name)
 
     if self.name and self.should_process:
-      def yield_full_tree(root):
-        """Depth-first recursion."""
-        yield root
-        for i in root.dependencies:
-          for j in yield_full_tree(i):
-            if j.should_process:
-              yield j
-
-      for obj in yield_full_tree(self.root):
+      for obj in self.root.depth_first_tree():
         if obj is self or not obj.name:
           continue
         # Step 1: Find any requirements self may need.
         if self.name.startswith(posixpath.join(obj.name, '')):
           self._requirements.add(obj.name)
         # Step 2: Find any requirements self may impose.
         if obj.name.startswith(posixpath.join(self.name, '')):
           try:
             # Access to a protected member _requirements of a client class
             # pylint: disable=W0212
@@ skipping 306 matching lines @@
       gclient_utils.CheckCallAndFilterAndHeader(
           command, cwd=self.root.root_dir, always=True)
     except (gclient_utils.Error, subprocess2.CalledProcessError), e:
       # Use a discrete exit status code of 2 to indicate that a hook action
       # failed.  Users of this script may wish to treat hook action failures
       # differently from VC failures.
       print >> sys.stderr, 'Error: %s' % str(e)
       sys.exit(2)
 
   def subtree(self, include_all):
-    """Breadth first"""
-    result = []
+    """Breadth first recursion excluding root node."""
     dependencies = self.dependencies
     for d in dependencies:
       if d.should_process or include_all:
-        result.append(d)
+        yield d
     for d in dependencies:
-      result.extend(d.subtree(include_all))
-    return result
+      for i in d.subtree(include_all):
+        yield i
+
+  def depth_first_tree(self):
+    """Depth-first recursion including the root node."""
+    yield self
+    for i in self.dependencies:
+      for j in i.depth_first_tree():
+        if j.should_process:
+          yield j
 
   def get_custom_deps(self, name, url):
     """Returns a custom deps if applicable."""
     if self.parent:
       url = self.parent.get_custom_deps(name, url)
     # None is a valid return value to disable a dependency.
     return self.custom_deps.get(name, url)
 
   @property
   def recursion_limit(self):
@@ skipping 829 matching lines @@
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   fix_encoding.fix_encoding()
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: