From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 19 Jan 2016 11:55:36 +0000 (+0200)
Subject: Issue #16620: Fixed AttributeError in msilib.Directory.glob().
X-Git-Tag: v3.6.0a1~738^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e914cd1308103de3f14cecbecc0f9aa46c8be074;p=thirdparty%2FPython%2Fcpython.git

Issue #16620: Fixed AttributeError in msilib.Directory.glob().
---

diff --git a/Lib/msilib/__init__.py b/Lib/msilib/__init__.py
index 873560d09b26..6d0a28f876ae 100644
--- a/Lib/msilib/__init__.py
+++ b/Lib/msilib/__init__.py
@@ -1,7 +1,11 @@
 # Copyright (C) 2005 Martin v. Löwis
 # Licensed to PSF under a Contributor Agreement.
 from _msi import *
-import os, string, re, sys
+import glob
+import os
+import re
+import string
+import sys
 
 AMD64 = "AMD64" in sys.version
 Itanium = "Itanium" in sys.version
diff --git a/Misc/NEWS b/Misc/NEWS
index b6e8fe1b900b..faad3139ad29 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -46,6 +46,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #16620: Fixed AttributeError in msilib.Directory.glob().
+
 - Issue #26013: Added compatibility with broken protocol 2 pickles created
   in old Python 3 versions (3.4.3 and lower).