From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 19 Jan 2016 12:09:33 +0000 (+0200)
Subject: Issue #16620: Got rid of using undocumented function glob.glob1().
X-Git-Tag: v3.6.0a1~737
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31a858cbf1eca34f04dd425fa7f8d6f031e5de66;p=python

Issue #16620: Got rid of using undocumented function glob.glob1().
---

diff --git a/Lib/msilib/__init__.py b/Lib/msilib/__init__.py
index 6d0a28f876..823644a006 100644
--- a/Lib/msilib/__init__.py
+++ b/Lib/msilib/__init__.py
@@ -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 @@ class Directory:
     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)