[Zope-CVS] CVS: Packages/zpkgtools/zpkgtools - include.py:1.5

[Fred L. Drake, Jr.]

Update of /cvs-repository/Packages/zpkgtools/zpkgtools
In directory cvs.zope.org:/tmp/cvs-serv12745

Modified Files:
	include.py 
Log Message:
simplify


=== Packages/zpkgtools/zpkgtools/include.py 1.4 => 1.5 ===
--- Packages/zpkgtools/zpkgtools/include.py:1.4	Thu Mar 18 12:50:28 2004
+++ Packages/zpkgtools/zpkgtools/include.py	Tue Mar 30 10:09:57 2004
@@ -113,7 +113,7 @@
             src = self.normalizePathOrURL(src, "source", filename, lineno)
             if src == "-":
                 path = os.path.join(self.source, dest)
-                expansions = self.glob(path)
+                expansions = self.filterNames(glob.glob(path))
                 if not expansions:
                     raise InclusionSpecificationError(
                         "exclusion %r doesn't match any files" % dest,
@@ -122,9 +122,6 @@
                     self.excludes[fn] = fn
             else:
                 self.includes[dest] = src
-
-    def glob(self, pattern):
-        return self.filterNames(glob.glob(pattern))
 
     def filterNames(self, names):
         names = [n for n in names