From 087bfa7d5f173af02cfaea419ca893028f92c377 Mon Sep 17 00:00:00 2001
From: Greg Neagle <gregneagle@mac.com>
Date: Wed, 4 Jan 2017 09:37:45 -0800
Subject: [PATCH] Rename munkilib/distutils.py to munkilib/appledistutils.py so
 as to not conflict with stdlib distutils

---
 .../{distutils.py => appledistutils.py}       |  2 +-
 code/client/munkilib/appleupdates.py          | 24 ++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)
 rename code/client/munkilib/{distutils.py => appledistutils.py} (99%)

diff --git a/code/client/munkilib/distutils.py b/code/client/munkilib/appledistutils.py
similarity index 99%
rename from code/client/munkilib/distutils.py
rename to code/client/munkilib/appledistutils.py
index dedbdef9..43a625f5 100755
--- a/code/client/munkilib/distutils.py
+++ b/code/client/munkilib/appledistutils.py
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-distutils.py
+appledistutils.py
 
 Created by Greg Neagle on 2017-01-04.
 
diff --git a/code/client/munkilib/appleupdates.py b/code/client/munkilib/appleupdates.py
index 97ce0de0..cfcedda0 100755
--- a/code/client/munkilib/appleupdates.py
+++ b/code/client/munkilib/appleupdates.py
@@ -30,15 +30,6 @@ import time
 import urllib2
 import urlparse
 
-import FoundationPlist
-import catalogs
-import distutils
-import fetch
-import launchd
-import munkicommon
-import munkistatus
-import updatecheck
-
 # PyLint cannot properly find names inside Cocoa libraries, so issues bogus
 # No name 'Foo' in module 'Bar' warnings. Disable them.
 # pylint: disable=E0611
@@ -55,6 +46,16 @@ from CoreFoundation import kCFPreferencesAnyUser
 from CoreFoundation import kCFPreferencesCurrentHost
 # pylint: enable=E0611
 
+from . import catalogs
+from . import appledistutils
+from . import fetch
+from . import launchd
+from . import munkicommon
+from . import munkistatus
+from . import updatecheck
+from . import FoundationPlist
+
+
 # Disable PyLint complaining about 'invalid' camelCase names
 # pylint: disable=C0103
 
@@ -872,8 +873,9 @@ class AppleUpdates(object):
                     english_dist = self.GetDistributionForProductKey(
                         product_key, sucatalog, 'English')
                     if english_dist:
-                        english_su_info = distutils.parse_su_dist(english_dist)
-                su_info = distutils.parse_su_dist(localized_dist)
+                        english_su_info = appledistutils.parse_su_dist(
+                            english_dist)
+                su_info = appledistutils.parse_su_dist(localized_dist)
                 su_info['productKey'] = product_key
                 if su_info['name'] == '':
                     su_info['name'] = product_key