Changeset 698

Show
Ignore:
Timestamp:
09/12/03 11:07:14 (5 years ago)
Author:
gwm
Message:

*** empty log message ***

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/RBFoundation/RBFoundation/_InstallerHookUtilities.py

    r636 r698  
    4444#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    4545 
    46 def MakePackageHook(prefix, file, recurse=True, includefiletypes=('*.py','*.pyw','*.pyc','*.pyo','*.pyd'), excludedirs=('CVS',)): 
     46def PackageFilter(filename): 
     47    return filename not in ('CVS',) 
     48 
     49def ModuleFilter(filename): 
     50    return (filename[0]!='_' or filename[1]=='_') 
     51 
     52def MakePackageHook(prefix, file, recurse=True, includefiletypes=('*.py','*.pyw','*.pyc','*.pyo','*.pyd'), packagefilter=PackageFilter, modulefilter=ModuleFilter): 
    4753    def GetPyModules(packagedir): 
    4854        modules = {} 
    4955        for filetype in includefiletypes: 
    50             for filename in packagedir.walkfiles(filetype ): 
     56            for filename in filter(modulefilter, packagedir.files(filetype)): 
    5157                modules[filename.splitext()[0].name] = True 
    5258 
    5359        if recurse: 
    54             for dirname in packagedir.walkdirs(): 
    55                 if dirname not in excludedirs: 
    56                     for result in GetPyModules(dirname): 
    57                         modules['%s.%s'%(dirname.name, result)] = True 
     60            for dirname in filter(packagefilter, packagedir.dirs()): 
     61                for result in GetPyModules(dirname): 
     62                    modules['%s.%s'%(dirname.name, result)] = True 
    5863        return modules.keys() 
    5964 
    …… 
    6469    for result in GetPyModules(packagedir): 
    6570        modules['%s.%s'%(prefix, result)] = True 
    66     return modules.keys() 
     71    return map(str, modules.keys()) 
    6772