changeset:   99984:f2586c381b0b
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Tue Jan 19 14:09:33 2016 +0200
files:       Lib/msilib/__init__.py
description:
Issue #16620: Got rid of using undocumented function glob.glob1().


diff -r 84a50f14a266 -r f2586c381b0b Lib/msilib/__init__.py
--- a/Lib/msilib/__init__.py	Tue Jan 19 14:06:13 2016 +0200
+++ b/Lib/msilib/__init__.py	Tue Jan 19 14:09:33 2016 +0200
@@ -1,7 +1,7 @@
 # Copyright (C) 2005 Martin v. Löwis
 # Licensed to PSF under a Contributor Agreement.
 from _msi import *
-import glob
+import fnmatch
 import os
 import re
 import string
@@ -379,7 +379,13 @@
     def glob(self, pattern, exclude = None):
         """Add a list of files to the current component as specified in the
         glob pattern. Individual files can be excluded in the exclude list."""
-        files = glob.glob1(self.absolute, pattern)
+        try:
+            files = os.listdir(self.absolute)
+        except OSError:
+            return []
+        if pattern[:1] != '.':
+            files = (f for f in files if f[0] != '.')
+        files = fnmatch.filter(files, pattern)
         for f in files:
             if exclude and f in exclude: continue
             self.add_file(f)