Mailing-List: contact commits-help@gump.apache.org; run by ezmlm
Precedence: bulk
Reply-To: general@gump.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r962395 - in /gump/trunk/python/gump/core/language:
 csharp.py
 java.py
Date: Fri, 09 Jul 2010 04:13:06 -0000
To: commits@gump.apache.org
From: bodewig@apache.org
Message-Id: <20100709041306.DD62D23889B3@eris.apache.org>

Author: bodewig
Date: Fri Jul  9 04:13:06 2010
New Revision: 962395

URL: http://svn.apache.org/viewvc?rev=962395&view=rev
Log:
pylint

Modified:
    gump/trunk/python/gump/core/language/csharp.py
    gump/trunk/python/gump/core/language/java.py

Modified: gump/trunk/python/gump/core/language/csharp.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/core/language/csharp.py?rev=962395&r1=962394&r2=962395&view=diff
==============================================================================
--- gump/trunk/python/gump/core/language/csharp.py (original)
+++ gump/trunk/python/gump/core/language/csharp.py Fri Jul  9 04:13:06 2010
@@ -11,14 +11,14 @@
 #     http://www.apache.org/licenses/LICENSE-2.0
 # 
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS, 
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 """
 
-	Generates paths for projects w/ dependencies
+        Generates paths for projects w/ dependencies
 
 """
 
@@ -31,36 +31,36 @@ import gump.util.process.command
 
 import gump.core.model.depend
 
-import gump.core.language.path
+from gump.core.language.path import AnnotatedPath, AssemblyPath
 
 ###############################################################################
 # Classes
 ###############################################################################
 
 class CSharpHelper(gump.core.run.gumprun.RunSpecific):
-    
-    def __init__(self,run):
-        gump.core.run.gumprun.RunSpecific.__init__(self,run)
-        
+
+    def __init__(self, run):
+        gump.core.run.gumprun.RunSpecific.__init__(self, run)
+
         # Caches for paths
-        self.paths={}     
-        
-    def getAssemblyPath(self,project,debug=False):
+        self.paths = {}
+
+    def getAssemblyPath(self, project, debug = False):
         """
         Get boot and regular classpaths for a project.
-        
+
         Return a path for this project
         """
         # Calculate path
-        libpath = self.getAssemblyPathObject(project,debug)
-        
+        libpath = self.getAssemblyPathObject(project, debug)
+
         # Return them simple/flattened
         return libpath.getFlattened()
 
-    def getAssemblyPathObject(self,project,debug=False):
+    def getAssemblyPathObject(self, project, debug = False):
         """
         Get a TOTAL path for a project (including its dependencies)
-        
+
         A path object for a project
         """
 
@@ -69,135 +69,156 @@ class CSharpHelper(gump.core.run.gumprun
         # doing it OO (each project context stores its own, but a step..)
         #
         if self.paths.has_key(project) :
-          if debug: print "Path previously resolved..."
-          return self.paths[project]
-  
+            if debug:
+                print "Path previously resolved..."
+            return self.paths[project]
+
         # Start with the system classpath (later remove this)
-        libpath=gump.core.language.path.AssemblyPath('Assembly Path')
+        libpath = AssemblyPath('Assembly Path')
 
         # Add this project's work directories
-        workdir=project.getModule().getWorkingDirectory()          
         for work in project.getWorks():
-            path=work.getResolvedPath()
+            path = work.getResolvedPath()
             if path:
-                libpath.addPathPart(gump.core.language.path.AnnotatedPath('',path,project,None,'Work Entity'))   
+                libpath.addPathPart(AnnotatedPath('', path, project, None,
+                                                  'Work Entity'))
             else:
-                log.error("<work element with neither 'nested' nor 'parent' attribute on " \
-                        + project.getName() + " in " + project.getModule().getName()) 
-              
+                log.error("<work element with neither 'nested' nor 'parent' " \
+                              + "attribute on " + project.getName() + " in " \
+                              + project.getModule().getName()) 
+
         # Append dependent projects (including optional)
-        visited=[]
-  
+        visited = []
+
         # Does it have any depends? Process all of them...
         for dependency in project.getDirectDependencies():
-            subp = self._getDependOutputList(project,dependency,visited,1,debug)
-            if subp:  libpath.importPath(subp)   
-    
+            subp = self._getDependOutputList(project, dependency, visited, 1,
+                                             debug)
+            if subp:
+                libpath.importPath(subp)
+
         # Store so we don't do this twice.
         self.paths[project] = libpath
-        
+
         return libpath
 
-    def _getDependOutputList(self,project,dependency,visited,depth=0,debug=0):      
+    def _getDependOutputList(self, project, dependency, visited, depth = 0,
+                             debug = 0):
         """
-        
+
                Perform this 'dependency' (mandatory or optional)
-               
+
             1) Bring in the JARs (or those specified by id in depend ids)
             2) Do NOT bring in the working entities (directories/libs)
-            3) Bring in the sub-depends (or optional) if inherit='all' or 'hard'
-            4) Bring in the runtime sub-depends if inherit='runtime'
+            3) Bring in the sub-depends (or optional) if inherit = 'all' or 'hard'
+            4) Bring in the runtime sub-depends if inherit = 'runtime'
             5) Also: *** Bring in any depenencies that the dependency inherits ***
-            
-           """            
-   
+
+           """
+
         # Skip ones that aren't here to affect the classpath
-        if dependency.isNoClasspath():  
+        if dependency.isNoClasspath():
             return None
-            
+
         # Don't loop
         if (dependency in visited):
-            # beneficiary.addInfo("Duplicated dependency [" + str(depend) + "]")          
+            # beneficiary.addInfo("Duplicated dependency [" + str(depend) + "]")
             if debug:
                 print str(depth) + ") Already Visited : " + str(dependency)
                 print str(depth) + ") Previously Visits  : "
                 for v in visited:
                     print str(depth) + ")  - " + str(v)
             return None
-            
+
         visited.append(dependency)
-        
+
         if debug:
             print str(depth) + ") Perform : " + `dependency`
-                  
+
         # 
-        libpath=gump.core.language.path.AssemblyPath('Assembly Path for ' + `dependency`)
+        libpath = AssemblyPath('Assembly Path for ' + `dependency`)
 
         # Context for this dependecy project...
-        project=dependency.getProject()
-  
+        project = dependency.getProject()
+
         # The dependency drivers...
         #
         # runtime (i.e. this is a runtime dependency)
         # inherit (i.e. inherit stuff from a dependency)
         #
-        runtime=dependency.runtime
-        inherit=dependency.inherit
+        runtime = dependency.runtime
+        inherit = dependency.inherit
         if dependency.ids:
-            ids=dependency.ids.split()
+            ids = dependency.ids.split()
         else:
-            ids=None
-  
+            ids = None
+
         # Explain..
-        dependStr=''
+        dependStr = ''
         if inherit: 
-            if dependStr: dependStr += ', '
-            dependStr += 'Inherit:'+dependency.getInheritenceDescription()
+            if dependStr:
+                dependStr += ', '
+            dependStr += 'Inherit:' + dependency.getInheritenceDescription()
         if runtime: 
-            if dependStr: dependStr += ', '
+            if dependStr:
+                dependStr += ', '
             dependStr += 'Runtime'
-  
+
         # Append JARS for this project
         #    (respect ids --- none means 'all)
         ####################################################
         # Note, if they don't come from the project outputs
         # (e.g. 'cos the project failed) attempt to get them
-        # from the repository. [This has been done already,
+        # from the repository. [This has been done already, 
         # so is transparent here.]
-        projectIds=[]
+        projectIds = []
         for output in project.getOutputs():
             # Store for double checking
-            if output.getId(): projectIds.append(output.getId())
-            
+            if output.getId():
+                projectIds.append(output.getId())
+
             # If 'all' or in ids list:
-            if (not ids) or (output.getId() in ids):   
-                if ids: dependStr += ' Id = ' + output.getId()
-                path=gump.core.language.path.AnnotatedPath(output.getId(),output.path,project,dependency.getOwnerProject(),dependStr) 
-          
+            if (not ids) or (output.getId() in ids):
+                if ids:
+                    dependStr += ' Id = ' + output.getId()
+                path = AnnotatedPath(output.getId(), output.path, project,
+                                     dependency.getOwnerProject(), dependStr) 
+
                 # Add to CLASSPATH
-                if debug:   print str(depth) + ') Append JAR : ' + str(path)
+                if debug:
+                    print str(depth) + ') Append JAR : ' + str(path)
                 libpath.addPathPart(path)
 
         # Double check IDs (to reduce stale ids in metadata)
         if ids:
             for id in ids:
                 if not id in projectIds:
-                    dependency.getOwnerProject().addWarning("Invalid ID [" + id \
-                          + "] for dependency on [" + project.getName() + "]")
+                    dependency.getOwnerProject()\
+                        .addWarning("Invalid ID [" + id \
+                                        + "] for dependency on [" \
+                                        + project.getName() + "]")
 
         # Append sub-projects outputs, if inherited
-        for subdependency in project.getDirectDependencies():        
-            #    If the dependency is set to 'all' (or 'hard') we inherit all dependencies
-            # If the dependency is set to 'runtime' we inherit all runtime dependencies
+        for subdependency in project.getDirectDependencies():
+            # If the dependency is set to 'all' (or 'hard') we inherit
+            # all dependencies
+            # If the dependency is set to 'runtime' we inherit all
+            # runtime dependencies
             # If the dependent project inherited stuff, we inherit that...
-            if        (inherit==gump.core.model.depend.INHERIT_ALL or inherit==gump.core.model.depend.INHERIT_HARD) \
-                    or (inherit==gump.core.model.depend.INHERIT_RUNTIME and subdependency.isRuntime()) \
-                    or (subdependency.inherit > gump.core.model.depend.INHERIT_NONE):      
-                subp = self._getDependOutputList(project,subdependency,visited,depth+1,debug)                
-                if subp:  libpath.importPath(subp)   
+            if        (inherit == gump.core.model.depend.INHERIT_ALL or \
+                           inherit == gump.core.model.depend.INHERIT_HARD) \
+                    or (inherit == gump.core.model.depend.INHERIT_RUNTIME \
+                            and subdependency.isRuntime()) \
+                    or (subdependency.inherit > \
+                            gump.core.model.depend.INHERIT_NONE):
+                subp = self._getDependOutputList(project, subdependency,
+                                                 visited, depth + 1, debug)
+                if subp:
+                    libpath.importPath(subp)
             elif debug:
-                print str(depth) + ') Skip : ' + str(subdependency) + ' in ' + project.name
+                print str(depth) + ') Skip : ' + str(subdependency) + ' in ' \
+                    + project.name
 
         return libpath
-                  
-        
+
+

Modified: gump/trunk/python/gump/core/language/java.py
URL: http://svn.apache.org/viewvc/gump/trunk/python/gump/core/language/java.py?rev=962395&r1=962394&r2=962395&view=diff
==============================================================================
--- gump/trunk/python/gump/core/language/java.py (original)
+++ gump/trunk/python/gump/core/language/java.py Fri Jul  9 04:13:06 2010
@@ -11,14 +11,14 @@
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an "AS IS" BASIS, 
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 """
 
-	Generates Classpaths for projects w/ dependencies
+        Generates Classpaths for projects w/ dependencies
 
 """
 
@@ -32,68 +32,68 @@ import gump.util.process.command
 
 import gump.core.model.depend
 
-import gump.core.language.path
+from gump.core.language.path import AnnotatedPath, Classpath
 
 ###############################################################################
 # Classes
 ###############################################################################
 
 class JavaHelper(gump.core.run.gumprun.RunSpecific):
-    
-    def __init__(self,run):
-        gump.core.run.gumprun.RunSpecific.__init__(self,run)
-        
+
+    def __init__(self, run):
+        gump.core.run.gumprun.RunSpecific.__init__(self, run)
+
         # Caches for classpaths
-        self.classpaths={}
-        self.bootclasspaths={}       
-        
-    def getJVMArgs(self,project):
-        
+        self.classpaths = {}
+        self.bootclasspaths = {}
+
+    def getJVMArgs(self, project):
+
         """ 
-        
+
         Get JVM arguments for a project 
-        
+
         """
         args = project.jvmargs
         if os.environ.has_key('GUMP_JAVA_ARGS'):
             args = gump.util.process.command.Parameters()
             for p in os.environ['GUMP_JAVA_ARGS'].split(' '):
-                args.addParameter(p);
+                args.addParameter(p)
             for p in project.jvmargs.items() :
-                args.addParameterObject(p);
+                args.addParameterObject(p)
         return args
-       
-    def getClasspaths(self,project,debug=False):
+
+    def getClasspaths(self, project, debug = False):
         """
         Get boot and regular classpaths for a project.
-        
+
         Return a (classpath, bootclaspath) tuple for this project
         """
         # Calculate classpath and bootclasspath
-        (classpath, bootclasspath) = self.getClasspathObjects(project,debug)
-        
+        (classpath, bootclasspath) = self.getClasspathObjects(project, debug)
+
         # Return them simple/flattened
         return ( classpath.getFlattened(), bootclasspath.getFlattened() )
-   
+
     def getBaseClasspath(self):
         """
-        
+
         The basic classpath needs to include a compiler...
-        
+
         Return a system classpath (to include $JAVA_HOME/lib/tools.jar'
         for a compiler).
         """
-        sysClasspath=gump.core.language.path.Classpath('System Classpath')
-        javaHome=self.run.getEnvironment().getJavaHome()
-        syscp=os.path.join(os.path.join(javaHome,'lib'),'tools.jar')
+        sysClasspath = Classpath('System Classpath')
+        javaHome = self.run.getEnvironment().getJavaHome()
+        syscp = os.path.join(os.path.join(javaHome, 'lib'), 'tools.jar')
         if os.path.exists(syscp):
-            sysClasspath.importFlattenedParts(syscp)        
+            sysClasspath.importFlattenedParts(syscp)
         return sysClasspath
 
-    def getClasspathObjects(self,project,debug=False):
+    def getClasspathObjects(self, project, debug = False):
         """
         Get a TOTAL classpath for a project (including its dependencies)
-        
+
         A tuple of (CLASSPATH, BOOTCLASSPATH) for a project
         """
 
@@ -101,161 +101,193 @@ class JavaHelper(gump.core.run.gumprun.R
         # Do this once only... storing it on the context. Not as nice as 
         # doing it OO (each project context stores its own, but a step..)
         #
-        if self.classpaths.has_key(project) and self.bootclasspaths.has_key(project) :
-          if debug: print "Classpath/Bootclasspath previously resolved..."
-          return ( self.classpaths[project], self.bootclasspaths[project] )
-  
+        if self.classpaths.has_key(project) and \
+                self.bootclasspaths.has_key(project) :
+            if debug:
+                print "Classpath/Bootclasspath previously resolved..."
+            return (self.classpaths[project], self.bootclasspaths[project])
+
         # Start with the system classpath (later remove this)
-        classpath=self.getBaseClasspath()
-        bootclasspath=gump.core.language.path.Classpath('Boot Classpath')
+        classpath = self.getBaseClasspath()
+        bootclasspath = Classpath('Boot Classpath')
 
         # Add this project's work directories (these go into
         # CLASSPATH, never BOOTCLASSPATH)
-        workdir=project.getModule().getWorkingDirectory()          
         for work in project.getWorks():
-            path=work.getResolvedPath()
+            path = work.getResolvedPath()
             if path:
-                classpath.addPathPart(gump.core.language.path.AnnotatedPath('',path,project,None,'Work Entity'))   
+                classpath.addPathPart(AnnotatedPath('', path, project, None,
+                                                    'Work Entity'))
             else:
-                log.error("<work element with neither 'nested' nor 'parent' attribute on " \
-                        + project.getName() + " in " + project.getModule().getName()) 
-              
+                log.error("<work element with neither 'nested' nor 'parent'" \
+                              + " attribute on " \
+                              + project.getName() + " in " \
+                              + project.getModule().getName()) 
+
         # Append dependent projects (including optional)
-        visited=[]
-  
+        visited = []
+
         # Does it have any depends? Process all of them...
         for dependency in project.getDirectDependencies():
-            (subcp, subbcp) = self._getDependOutputList(project,dependency,visited,1,debug)
-            self._importClasspaths(classpath,bootclasspath,subcp,subbcp)
-    
+            (subcp, subbcp) = self._getDependOutputList(project, dependency,
+                                                        visited, 1, debug)
+            _importClasspaths(classpath, bootclasspath, subcp, subbcp)
+
         # Store so we don't do this twice.
         self.classpaths[project] = classpath
         self.bootclasspaths[project] = bootclasspath
-        
+
         return ( classpath, bootclasspath )
 
-    def _getDependOutputList(self,project,dependency,visited,depth=0,debug=0):      
+    def _getDependOutputList(self, project, dependency, visited, depth = 0,
+                             debug = 0):
         """
-        
+
                Perform this 'dependency' (mandatory or optional)
-               
+
             1) Bring in the JARs (or those specified by id in depend ids)
             2) Do NOT bring in the working entities (directories/jars)
-            3) Bring in the sub-depends (or optional) if inherit='all' or 'hard'
-            4) Bring in the runtime sub-depends if inherit='runtime'
+            3) Bring in the sub-depends (or optional) if inherit = 'all' or 'hard'
+            4) Bring in the runtime sub-depends if inherit = 'runtime'
             5) Also: *** Bring in any depenencies that the dependency inherits ***
-            
-           """            
-   
+
+           """
+
         # Skip ones that aren't here to affect the classpath
-        if dependency.isNoClasspath():  
-            return (None,None)
-            
+        if dependency.isNoClasspath():
+            return (None, None)
+
         # Don't loop
         if (dependency in visited):
-            # beneficiary.addInfo("Duplicated dependency [" + str(depend) + "]")          
+            # beneficiary.addInfo("Duplicated dependency [" + str(depend) + "]")
             if debug:
                 print str(depth) + ") Already Visited : " + str(dependency)
                 print str(depth) + ") Previously Visits  : "
                 for v in visited:
                     print str(depth) + ")  - " + str(v)
-            return (None,None)
-            
+            return (None, None)
+
         visited.append(dependency)
-        
+
         if debug:
             print str(depth) + ") Perform : " + `dependency`
-                  
+
         # 
-        classpath=gump.core.language.path.Classpath('Classpath for ' + `dependency`)
-        bootclasspath=gump.core.language.path.Classpath('Bootclasspath for ' + `dependency`)
+        classpath = Classpath('Classpath for ' + `dependency`)
+        bootclasspath = Classpath('Bootclasspath for ' + `dependency`)
 
         # Context for this dependecy project...
-        project=dependency.getProject()
-  
+        project = dependency.getProject()
+
         # The dependency drivers...
         #
         # runtime (i.e. this is a runtime dependency)
         # inherit (i.e. inherit stuff from a dependency)
         #
-        runtime=dependency.runtime
-        inherit=dependency.inherit
+        runtime = dependency.runtime
+        inherit = dependency.inherit
         if dependency.ids:
-            ids=dependency.ids.split()
+            ids = dependency.ids.split()
         else:
-            ids=None
-  
+            ids = None
+
         # Explain..
-        dependStr=''
+        dependStr = ''
         if inherit: 
-            if dependStr: dependStr += ', '
-            dependStr += 'Inherit:'+dependency.getInheritenceDescription()
+            if dependStr:
+                dependStr += ', '
+            dependStr += 'Inherit:' + dependency.getInheritenceDescription()
         if runtime: 
-            if dependStr: dependStr += ', '
+            if dependStr:
+                dependStr += ', '
             dependStr += 'Runtime'
-  
+
         # Append JARS for this project
         #    (respect ids --- none means 'all)
         ####################################################
         # Note, if they don't come from the project outputs
         # (e.g. 'cos the project failed) attempt to get them
-        # from the repository. [This has been done already,
+        # from the repository. [This has been done already, 
         # so is transparent here.]
-        projectIds=[]
+        projectIds = []
         for jar in project.getOutputs():
             # Store for double checking
-            if jar.getId(): projectIds.append(jar.getId())
-            
+            if jar.getId():
+                projectIds.append(jar.getId())
+
             # If 'all' or in ids list:
-            if (not ids) or (jar.getId() in ids):   
-                if ids: dependStr += ' Id = ' + jar.getId()
-                path=gump.core.language.path.AnnotatedPath(jar.getId(),jar.path,project,dependency.getOwnerProject(),dependStr) 
-          
+            if (not ids) or (jar.getId() in ids):
+                if ids:
+                    dependStr += ' Id = ' + jar.getId()
+                path = AnnotatedPath(jar.getId(), jar.path, project,
+                                     dependency.getOwnerProject(), dependStr) 
+
                 # Add to CLASSPATH
                 if not jar.getType() == 'boot':
-                    if debug:   print str(depth) + ') Append JAR : ' + str(path)
+                    if debug:
+                        print str(depth) + ') Append JAR : ' + str(path)
                     classpath.addPathPart(path)
                 else:
                     # Add to BOOTCLASSPATH
-                    if debug:   print str(depth) + ') Append *BOOTCLASSPATH* JAR : ' + str(path)
-                    bootclasspath.addPathPart(path)    
+                    if debug:
+                        print str(depth) + ') Append *BOOTCLASSPATH* JAR : ' \
+                            + str(path)
+                    bootclasspath.addPathPart(path)
 
         # Double check IDs (to reduce stale ids in metadata)
         if ids:
             for id in ids:
                 if not id in projectIds:
-                    dependency.getOwnerProject().addWarning("Invalid ID [" + id \
-                          + "] for dependency on [" + project.getName() + "]")
+                    dependency.getOwnerProject()\
+                        .addWarning("Invalid ID [" + id \
+                                        + "] for dependency on [" \
+                                        + project.getName() + "]")
 
         # Append sub-projects outputs, if inherited
-        for subdependency in project.getDirectDependencies():        
-        	#
-        	# 	For the main project we working on, we care about it's request for inheritence
-        	#	but we don't recursively inherit. (i.e. we only do this at recursion depth 1).
-        	#
-            #   If the dependency is set to 'all' (or 'hard') we inherit all dependencies.
-            # 	If the dependency is set to 'runtime' we inherit all runtime dependencies.
+        for subdependency in project.getDirectDependencies():
             #
-            #	INHERIT_OUTPUTS (aka INHERIT_JARS) is more sticky, and we track that down (and down, ...).
+            #   For the main project we working on, we care about it's
+            #   request for inheritence but we don't recursively
+            #   inherit. (i.e. we only do this at recursion depth 1).
             #
-            if   (  ( ( 1 == depth ) and \
-                 	(inherit in [ gump.core.model.depend.INHERIT_ALL, gump.core.model.depend.INHERIT_HARD ]) \
-                    	or \
-                    (inherit == gump.core.model.depend.INHERIT_RUNTIME and subdependency.isRuntime()) ) \
-                   or \
-                   	( inherit in [ gump.core.model.depend.INHERIT_OUTPUTS ] ) ) :      
-                (subcp, subbcp) = self._getDependOutputList(project,subdependency,visited,depth+1,debug)
-                self._importClasspaths(classpath,bootclasspath,subcp,subbcp)   
+
+            #   If the dependency is set to 'all' (or 'hard') we
+            #   inherit all dependencies.
+            #   If the dependency is set to 'runtime' we inherit all
+            #   runtime dependencies.
+            #
+            #   INHERIT_OUTPUTS (aka INHERIT_JARS) is more sticky, and
+            #   we track that down (and down, ...).
+            #
+            if (
+                ( ( 1 == depth ) and \
+                       (inherit in [ gump.core.model.depend.INHERIT_ALL,
+                                     gump.core.model.depend.INHERIT_HARD ]) \
+                       or \
+                       (inherit == gump.core.model.depend.INHERIT_RUNTIME \
+                            and subdependency.isRuntime())
+                  ) \
+                    or \
+                    (inherit in [ gump.core.model.depend.INHERIT_OUTPUTS ])
+                ) :
+                (subcp, subbcp) = self._getDependOutputList(project,
+                                                            subdependency,
+                                                            visited, depth + 1,
+                                                            debug)
+                _importClasspaths(classpath, bootclasspath, subcp, subbcp)
             elif debug:
-                print str(depth) + ') Skip : ' + str(subdependency) + ' in ' + project.name
+                print str(depth) + ') Skip : ' + str(subdependency) \
+                    + ' in ' + project.name
 
         return (classpath, bootclasspath)
-    
-    def _importClasspaths(self,classpath,bootclasspath,cp,bcp):
-        """    
-        Import cp and bcp into classpath and bootclasspath,
-        but do not accept duplicates. Report duplicates.
-        """
-        if cp:  classpath.importPath(cp)                
-        if bcp: bootclasspath.importPath(bcp)                      
-        
+
+def _importClasspaths(classpath, bootclasspath, cp, bcp):
+    """
+    Import cp and bcp into classpath and bootclasspath, 
+    but do not accept duplicates. Report duplicates.
+    """
+    if cp:
+        classpath.importPath(cp)
+    if bcp:
+        bootclasspath.importPath(bcp)
+