From: DongHun Kwak <dh0128.kwak@samsung.com>
Date: Mon, 14 Jan 2019 01:32:53 +0000 (+0900)
Subject: Imported Upstream version 36.0.1
X-Git-Tag: upstream/36.0.1^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47e1288e1086998e82bdd80a68938e8017e4304b;p=platform%2Fupstream%2Fpython-setuptools.git

Imported Upstream version 36.0.1
---

diff --git a/.travis.yml b/.travis.yml
index fa26015..6d6333f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,8 +27,6 @@ script:
  #- python -m tox
  - tox
 
-before_deploy:
-  - pip install -r requirements.txt
 deploy:
   provider: pypi
   # Also update server in setup.cfg
diff --git a/CHANGES.rst b/CHANGES.rst
index bc13fd8..b2d1ed9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v36.0.1
+-------
+
+* #1042: Fix import in py27compat module that still
+  referenced six directly, rather than through the externs
+  module (vendored packages hook).
+
 v36.0.0
 -------
 
diff --git a/setup.cfg b/setup.cfg
index e39b524..b5199a6 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.0.0
+current_version = 36.0.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 9250e07..6eaac16 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.0.0",
+    version="36.0.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",
diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 701283c..2985011 100644
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -4,7 +4,7 @@ Compatibility Support for Python 2.7 and earlier
 
 import platform
 
-import six
+from setuptools.extern import six
 
 
 def get_all_headers(message, key):