Merge branch 'master' into mypy/infrastructure

docs/installing.rst

@@ -6,13 +6,11 @@ Installation
 Do I need to install pip?
 -------------------------
 
-pip is already installed if you're using Python 2 >=2.7.9 or Python 3 >=3.4
-binaries downloaded from `python.org <https://www.python.org>`_, but you'll
-need to :ref:`upgrade pip <Upgrading pip>`.
-
-Additionally, pip will already be installed if you're working in a :ref:`Virtual
-Environment <pypug:Creating and using Virtual Environments>` created by
-:ref:`pypug:virtualenv` or :ref:`pyvenv <pypug:venv>`.
+pip is already installed if you are using Python 2 >=2.7.9 or Python 3 >=3.4 
+downloaded from `python.org <https://www.python.org>`_ or if you are working 
+in a :ref:`Virtual Environment <pypug:Creating and using Virtual Environments>` 
+created by :ref:`pypug:virtualenv` or :ref:`pyvenv <pypug:venv>`. 
+Just make sure to :ref:`upgrade pip <Upgrading pip>`.
 
 
 .. _`get-pip`:
@@ -21,25 +19,25 @@ Installing with get-pip.py
 --------------------------
 
 To install pip, securely download `get-pip.py
-<https://bootstrap.pypa.io/get-pip.py>`_. [1]_
+<https://bootstrap.pypa.io/get-pip.py>`_. [1]_::
 
-Then run the following:
+ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
 
-::
+Inspect ``get-pip.py`` for any malevolence. Then run the following::
 
  python get-pip.py
 
 
 .. warning::
 
-   Be cautious if you're using a Python install that's managed by your operating
-   system or another package manager. get-pip.py does not coordinate with
+   Be cautious if you are using a Python install that is managed by your operating
+   system or another package manager. ``get-pip.py`` does not coordinate with
    those tools, and may leave your system in an inconsistent state.
 
-get-pip.py will also install :ref:`pypug:setuptools` [2]_ and :ref:`pypug:wheel`,
-if they're not already. :ref:`pypug:setuptools` is required to install
+``get-pip.py`` also installs :ref:`pypug:setuptools` [2]_ and :ref:`pypug:wheel` 
+if they are not already. :ref:`pypug:setuptools` is required to install
 :term:`source distributions <pypug:Source Distribution (or "sdist")>`.  Both are
-required to be able to build a :ref:`Wheel cache` (which improves installation
+required in order to build a :ref:`Wheel cache` (which improves installation
 speed), although neither are required to install pre-built :term:`wheels
 <pypug:Wheel>`.
 
@@ -55,14 +53,14 @@ get-pip.py options
 
 .. option:: --no-setuptools
 
-    If set, don't attempt to install :ref:`pypug:setuptools`
+    If set, do not attempt to install :ref:`pypug:setuptools`
 
 .. option:: --no-wheel
 
-    If set, don't attempt to install :ref:`pypug:wheel`
+    If set, do not attempt to install :ref:`pypug:wheel`
 
 
-Additionally, ``get-pip.py`` supports using the :ref:`pip install options <pip
+``get-pip.py`` allows :ref:`pip install options <pip
 install Options>` and the :ref:`general options <General Options>`. Below are
 some examples:
 
@@ -91,16 +89,12 @@ the `Python Packaging User Guide
 Upgrading pip
 -------------
 
-On Linux or macOS:
-
-::
+On Linux or macOS::
 
  pip install -U pip
 
 
-On Windows [4]_:
-
-::
+On Windows [4]_::
 
  python -m pip install -U pip
 

news/setuptools.vendor

@@ -1 +1 @@
-Upgraded pkg_resources (via setuptools) to 35.0.2.
+Upgraded pkg_resources (via setuptools) to 36.2.6.

pip/_vendor/pkg_resources/__init__.py

@@ -37,6 +37,7 @@
 import tempfile
 import textwrap
 import itertools
+import inspect
 from pkgutil import get_importer
 
 try:
@@ -67,13 +68,15 @@
 except ImportError:
     importlib_machinery = None
 
+from . import py31compat
 from pip._vendor import appdirs
 from pip._vendor import packaging
 __import__('pip._vendor.packaging.version')
 __import__('pip._vendor.packaging.specifiers')
 __import__('pip._vendor.packaging.requirements')
 __import__('pip._vendor.packaging.markers')
 
+
 if (3, 0) < sys.version_info < (3, 3):
     raise RuntimeError("Python 3.3 or later is required")
 
@@ -1550,7 +1553,7 @@ def _setup_prefix(self):
         path = self.module_path
         old = None
         while path != old:
-            if _is_unpacked_egg(path):
+            if _is_egg_path(path):
                 self.egg_name = os.path.basename(path)
                 self.egg_info = os.path.join(path, 'EGG-INFO')
                 self.egg_root = path
@@ -1953,7 +1956,7 @@ def find_eggs_in_zip(importer, path_item, only=False):
         # don't yield nested distros
         return
     for subitem in metadata.resource_listdir('/'):
-        if _is_unpacked_egg(subitem):
+        if _is_egg_path(subitem):
             subpath = os.path.join(path_item, subitem)
             for dist in find_eggs_in_zip(zipimport.zipimporter(subpath), subpath):
                 yield dist
@@ -2030,7 +2033,7 @@ def find_on_path(importer, path_item, only=False):
                     yield Distribution.from_location(
                         path_item, entry, metadata, precedence=DEVELOP_DIST
                     )
-                elif not only and _is_unpacked_egg(entry):
+                elif not only and _is_egg_path(entry):
                     dists = find_distributions(os.path.join(path_item, entry))
                     for dist in dists:
                         yield dist
@@ -2218,12 +2221,22 @@ def _normalize_cached(filename, _cache={}):
         return result
 
 
+def _is_egg_path(path):
+    """
+    Determine if given path appears to be an egg.
+    """
+    return (
+        path.lower().endswith('.egg')
+    )
+
+
 def _is_unpacked_egg(path):
     """
     Determine if given path appears to be an unpacked egg.
     """
     return (
-        path.lower().endswith('.egg')
+        _is_egg_path(path) and
+        os.path.isfile(os.path.join(path, 'EGG-INFO', 'PKG-INFO'))
     )
 
 
@@ -2937,6 +2950,7 @@ def parse(s):
         return req
 
 
+<<<<<<< HEAD
 def _get_mro(cls):
     """Get an mro for a type or classic class"""
     if not isinstance(cls, type):
@@ -2946,20 +2960,40 @@ class new_cls(cls, object):
 
         return new_cls.__mro__[1:]
     return cls.__mro__
+||||||| merged common ancestors
+def _get_mro(cls):
+    """Get an mro for a type or classic class"""
+    if not isinstance(cls, type):
+
+        class cls(cls, object):
+            pass
+
+        return cls.__mro__[1:]
+    return cls.__mro__
+=======
+def _always_object(classes):
+    """
+    Ensure object appears in the mro even
+    for old-style classes.
+    """
+    if object not in classes:
+        return classes + (object,)
+    return classes
+>>>>>>> master
 
 
 def _find_adapter(registry, ob):
     """Return an adapter factory for `ob` from `registry`"""
-    for t in _get_mro(getattr(ob, '__class__', type(ob))):
+    types = _always_object(inspect.getmro(getattr(ob, '__class__', type(ob))))
+    for t in types:
         if t in registry:
             return registry[t]
 
 
 def ensure_directory(path):
     """Ensure that the parent directory of `path` exists"""
     dirname = os.path.dirname(path)
-    if not os.path.isdir(dirname):
-        os.makedirs(dirname)
+    py31compat.makedirs(dirname, exist_ok=True)
 
 
 def _bypass_ensure_directory(path):

pip/_vendor/pkg_resources/py31compat.py

@@ -0,0 +1,22 @@
+import os
+import errno
+import sys
+
+
+def _makedirs_31(path, exist_ok=False):
+    try:
+        os.makedirs(path)
+    except OSError as exc:
+        if not exist_ok or exc.errno != errno.EEXIST:
+            raise
+
+
+# rely on compatibility behavior until mode considerations
+#  and exists_ok considerations are disentangled.
+# See https://github.com/pypa/setuptools/pull/1083#issuecomment-315168663
+needs_makedirs = (
+    sys.version_info < (3, 2, 5) or
+    (3, 3) <= sys.version_info < (3, 3, 6) or
+    (3, 4) <= sys.version_info < (3, 4, 1)
+)
+makedirs = _makedirs_31 if needs_makedirs else os.makedirs

pip/_vendor/pytoml/__init__.py

@@ -1,3 +1,3 @@
-from .core import TomlError
-from .parser import load, loads
-from .writer import dump, dumps
+from .core import TomlError
+from .parser import load, loads
+from .writer import dump, dumps

pip/_vendor/pytoml/core.py

@@ -1,13 +1,13 @@
-class TomlError(RuntimeError):
-    def __init__(self, message, line, col, filename):
-        RuntimeError.__init__(self, message, line, col, filename)
-        self.message = message
-        self.line = line
-        self.col = col
-        self.filename = filename
-
-    def __str__(self):
-        return '{}({}, {}): {}'.format(self.filename, self.line, self.col, self.message)
-
-    def __repr__(self):
-        return 'TomlError({!r}, {!r}, {!r}, {!r})'.format(self.message, self.line, self.col, self.filename)
+class TomlError(RuntimeError):
+    def __init__(self, message, line, col, filename):
+        RuntimeError.__init__(self, message, line, col, filename)
+        self.message = message
+        self.line = line
+        self.col = col
+        self.filename = filename
+
+    def __str__(self):
+        return '{}({}, {}): {}'.format(self.filename, self.line, self.col, self.message)
+
+    def __repr__(self):
+        return 'TomlError({!r}, {!r}, {!r}, {!r})'.format(self.message, self.line, self.col, self.filename)