From 9063c163e105545bacb67865f5d35056eb342a49 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 24 Dec 2014 17:02:04 -0500
Subject: Move vendored packaging module into pkg_resources._vendor, restoring
 independence of pkg_resources from setuptools. Fixes #311.

---
 setuptools/dist.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'setuptools/dist.py')

diff --git a/setuptools/dist.py b/setuptools/dist.py
index e44796fd..2daa2835 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -17,8 +17,8 @@ try:
     import packaging.version
 except ImportError:
     # fallback to vendored version
-    import setuptools._vendor.packaging.version
-    packaging = setuptools._vendor.packaging
+    import pkg_resources._vendor.packaging.version
+    packaging = pkg_resources._vendor.packaging
 
 from setuptools.depends import Require
 from setuptools.compat import basestring, PY2
-- 
cgit v1.2.1